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 /config/initializers | |
| 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 'config/initializers')
| -rw-r--r-- | config/initializers/alaveteli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 775c9ec5b..7465a5ca1 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.21.0.5' +ALAVETELI_VERSION = '0.21.0.6' # Add new inflection rules using the following format # (all these examples are active by default): |