diff options
| author | spag <spag@golwen.net> | 2013-01-20 16:21:58 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-20 16:21:58 +0100 |
| commit | 9b5879a97ebb5887e089edac5d1a89ea6f97e5fb (patch) | |
| tree | 59378b27e9e2c57e843f9bb1ac524540ee30b191 /Gemfile.lock | |
| parent | 6e269043f470b597dcc256170c9167e164e74fec (diff) | |
| parent | 2a130f0ed2a5ada0fda15ee71cd600a25810dcb4 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0beeb3b..3ee9d06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,6 +147,9 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sextant (0.2.3) + activesupport (>= 3.2) + rails (>= 3.2) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) @@ -210,6 +213,7 @@ DEPENDENCIES private_pub rails (= 3.2.11) sass-rails + sextant simple_form (= 2.0.1) sqlite3 state_machine |