diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-04-07 11:57:38 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-04-07 11:57:38 +0100 |
| commit | ffb17f312c312fdba49ab961520d423bdde22503 (patch) | |
| tree | 640f364c8704449df1537c7f9149df674e8132d5 /lib | |
| parent | 77eda53b4348d557c22047f7923f77b0077d9ed3 (diff) | |
| parent | b7fcc17562efc0a6073f9d00bfbe137ca85f0038 (diff) | |
Merge branch 'hotfix/0.21.0.6'0.21.0.6
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions