diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-04-02 14:46:25 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-04-02 14:46:25 +0100 |
| commit | cedffee3077a52f1fe08f6c7a649ae60d3c64355 (patch) | |
| tree | f5dec49e1a58b779bdea4792bc89461f477bf5b4 /lib/configuration.rb | |
| parent | 1de541184eaa011123763aba8803896cc6426fc8 (diff) | |
| parent | 4087d59461fd45a8c3a53d70d740801e86c6a2a6 (diff) | |
Merge branch 'hotfix/0.21.0.4' into rails-3-develop
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'lib/configuration.rb')
0 files changed, 0 insertions, 0 deletions