diff options
| author | amurrel <amurrel@purdue.edu> | 2014-09-06 20:28:53 -0400 |
|---|---|---|
| committer | amurrel <amurrel@purdue.edu> | 2014-09-06 20:28:53 -0400 |
| commit | eec068ed1526e194f5f8411cdecb3dfc1645c604 (patch) | |
| tree | 146b53644f602d8596080d8a6510d869377b595b /Gemfile | |
| parent | 9127b3aca0ea384877e05d54fd01bb1d9d3b812f (diff) | |
| parent | c3953f62c98cb51596673a48087a1124b7793e51 (diff) | |
Merge branch 'clean'
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -29,9 +29,9 @@ end # gem 'capybara', '2.1.0' # end -# Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.0' -gem 'bootstrap-sass' +# Use LESS for stylesheets +gem 'less-rails' +gem 'twitter-bootstrap-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' |