gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:mbarringer/osem

Browse source
This commit is contained in:
Matt Barringer 2013-01-15 13:45:01 +01:00
commit 2a4c3d3781
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -81,6 +81,7 @@ GEM
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.19) mime-types (1.19)
multi_json (1.5.0) multi_json (1.5.0)
mysql2 (0.3.11)
node (0.0.2) node (0.0.2)
eventmachine eventmachine
orm_adapter (0.4.0) orm_adapter (0.4.0)
@ -171,6 +172,7 @@ DEPENDENCIES
haml haml
jquery-fileupload-rails jquery-fileupload-rails
jquery-rails jquery-rails
mysql2
node node
paper_trail paper_trail
paperclip (~> 3.0) paperclip (~> 3.0)