diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-06-24 11:19:43 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-06-24 11:19:43 +0100 |
| commit | 2cce1794a4d9d2c42b83bab8a693900e8ca23ebc (patch) | |
| tree | 7408a04d5ac0963ec2defbbf7d4955cff7cd62b5 /config/initializers | |
| parent | ed6b256539e0dcaa3764951d90e2dc599a8acddd (diff) | |
| parent | 54ba7a4fa232ad3b57310551b9a5e19d72060abe (diff) | |
Merge branch 'develop' into release-22-develop
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/alaveteli.rb | 2 | ||||
| -rw-r--r-- | config/initializers/xml.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 506e3471f..d4b4be7bc 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -11,7 +11,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.21.0.36' +ALAVETELI_VERSION = '0.21.0.38' # Add new inflection rules using the following format # (all these examples are active by default): diff --git a/config/initializers/xml.rb b/config/initializers/xml.rb new file mode 100644 index 000000000..aefd54214 --- /dev/null +++ b/config/initializers/xml.rb @@ -0,0 +1,2 @@ +ActiveSupport::XmlMini.backend = 'Nokogiri' + |