andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source 
Conflicts:
	app/assets/javascripts/application.js
This commit is contained in:
Andreas Stephanides
2014-02-09 23:07:38 +01:00
parent 825dc23de1 bb8f427f95
commit 98d3032850
13 changed files with 223 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -86,6 +86,9 @@ gem 'rmagick'
gem 'bootstrap-addons-rails'
gem "jquery-fileupload-rails"
gem "jquery-ui-rails","~> 4.1.1"
# gem "jquery-sortable-rails"
gem "seed_dump", "~> 0.5.3"
#gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git'
#gem "themes_for_rails", :git=> 'git://github.com/lucasefe/themes_for_rails.git'