gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Aditya Chatterjee 2016-03-01 18:56:12 +05:30
commit 1e9f4b514c
20 changed files with 193 additions and 3786 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Gemfile
View file

@ -52,7 +52,11 @@ gem 'uglifier', '>= 1.3.0'
gem 'bootstrap-sass', '~> 3.3.4.1'
gem 'autoprefixer-rails'
gem 'formtastic-bootstrap'
<<<<<<< HEAD
gem 'formtastic', '~> 2.3.0.rc3'
=======
gem 'formtastic', '~> 3.1.1'
>>>>>>> upstream/master
gem 'cocoon'
# frontend javascripts
@ -85,7 +89,10 @@ end
gem 'bootstrap3-datetimepicker-rails', '~> 3.0.2'
gem 'jquery-datatables-rails', '~> 2.2.1'
# for charts
<<<<<<< HEAD
gem 'd3_rails'
=======
>>>>>>> upstream/master
gem 'chart-js-rails'
# for user avatars