diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-11 19:31:39 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-11 19:31:39 +0100 |
commit | d17059acb5fb56b68d1afe0e15e8d62e2842bbc8 (patch) | |
tree | 65d4537721f90327c490b43af845625f16ac987b /Gemfile.lock | |
parent | 697477cca48c8402c6d8e1df73d5c8c902c582ee (diff) | |
parent | af49b3390ce352297c3b601c69b6b0557a9ae01d (diff) |
Merge branch 'read_odbc_ini_file' into develop
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fc4ba3a..77d09fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,6 +93,7 @@ GEM http_accept_language (1.0.2) http_parser.rb (0.5.3) i18n (0.6.1) + inifile (2.0.2) journey (1.0.3) jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) @@ -192,6 +193,7 @@ DEPENDENCIES haml hirb http_accept_language + inifile jquery-rails json mini_magick |