diff options
| author | Xinhui | 2016-08-31 11:05:20 +0200 |
|---|---|---|
| committer | Xinhui | 2016-08-31 11:05:20 +0200 |
| commit | b554d044d04ae0a63b86ece48ddf57544dd6f4cd (patch) | |
| tree | ce0e9e3cbaef69ac47d889a3e7628b646cdc7c87 /Gemfile.lock | |
| parent | 62ae1074e7536dd170b0214ed339b7ad9323967d (diff) | |
| parent | d71549685f124fd895b01884f7d236cf09b96e85 (diff) | |
| download | chouette-core-b554d044d04ae0a63b86ece48ddf57544dd6f4cd.tar.bz2 | |
Merge reflex into master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8bc64b5ad..face621eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,6 +12,13 @@ GIT codifligne (0.0.2) nokogiri (~> 1.6) +GIT + remote: git@github.com:AF83/stif-reflex-api.git + revision: 41b496bac3398348178da1227975219903a17fa2 + specs: + reflex (0.0.1) + nokogiri (~> 1.6) + GEM remote: http://rubygems.org/ remote: http://rails-assets.org/ @@ -604,6 +611,7 @@ DEPENDENCIES ransack rb-fsevent rb-inotify + reflex! rgeo (~> 0.5.2) roo rspec-rails (~> 3.1.0) |