DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://37.187.249.111:2200/opt/git/admi_facile

Browse source 
Conflicts:
	.ruby-version
This commit is contained in:
Xavier J 2015-08-11 15:40:26 +02:00
commit 7bd396a027
4 changed files with 4 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -3,8 +3,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets