diff options
| author | amurrel <amurrel@purdue.edu> | 2014-09-06 22:06:00 -0400 |
|---|---|---|
| committer | amurrel <amurrel@purdue.edu> | 2014-09-06 22:06:00 -0400 |
| commit | 7434754f183a8da6047919c1f3e562a6a18188f2 (patch) | |
| tree | de652b7c52a1134d4b94f0ad0b15aaf7fbc1037d | |
| parent | eec068ed1526e194f5f8411cdecb3dfc1645c604 (diff) | |
| parent | 809f1d48b0db4db579556c9ae660099331861217 (diff) | |
Merge branch 'clean'
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 48648a9..f82a32d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,6 +83,7 @@ GEM minitest (4.7.5) multi_json (1.10.1) multi_xml (0.5.5) + pg (0.17.1) polyglot (0.3.5) rack (1.5.2) rack-test (0.6.2) @@ -144,6 +145,8 @@ PLATFORMS ruby DEPENDENCIES + activerecord-jdbcpostgresql-adapter + activerecord-jdbcsqlite3-adapter bcrypt-ruby (= 3.1.2) coffee-rails (~> 4.0.0) daemons @@ -154,11 +157,14 @@ DEPENDENCIES jquery-rails less-rails mailboxer + pg rails (= 4.0.2) sdoc simple_captcha2 sqlite3 therubyracer + therubyrhino turbolinks twitter-bootstrap-rails uglifier (>= 1.3.0) + warbler |