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

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

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Andreas Stephanides
2014-02-20 10:52:49 +01:00
parent 16102fbef6 b910973ee6
commit fce30918a9
4 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -44,7 +44,7 @@ gem 'jquery-rails'
gem 'formtastic', '~>2.2.1'
gem 'formtastic-bootstrap', '~>2.1.3' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git"
# TinyMCE
gem "tinymce-rails" , '>=3.5.8'
gem "tinymce-rails" , '~>3.5.8'
# Internationalisierung
#gem "globalize3" ,'~>3.0.4'
@@ -93,4 +93,4 @@ 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'
gem 'themes_for_rails'
gem 'remotipart', :git =>'git://github.com/JangoSteve/remotipart.git'
gem 'remotipart', :git =>'git://github.com/JangoSteve/remotipart.git'