aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-04-02 14:10:31 +0100
committerLouise Crow <louise.crow@gmail.com>2015-04-02 14:10:31 +0100
commit7d2487bbc816a674817f3811d4b8f87072c72632 (patch)
treeabef2683797c2a38bd91ae3116521e0e7581a315
parent0a4c99a397e37064704c6706bf9c636d1157dbe2 (diff)
parent4087d59461fd45a8c3a53d70d740801e86c6a2a6 (diff)
Merge branch 'hotfix/0.21.0.4'0.21.0.4
Conflicts: config/initializers/alaveteli.rb
m---------commonlib0
-rw-r--r--config/initializers/alaveteli.rb2
2 files changed, 1 insertions, 1 deletions
diff --git a/commonlib b/commonlib
-Subproject cd0486209761344a7a10bd81b840a468e232e0b
+Subproject 2a0271d3a6aaba9c429261b8c94e0e7acb6bd68
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 3465f6f4d..e5ca9519e 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.3'
+ALAVETELI_VERSION = '0.21.0.4'
# Add new inflection rules using the following format
# (all these examples are active by default):