aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts/general.js
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature/cleanup-popups' into release/0.16Louise Crow2014-01-14-34/+41
| | | | | | | | Conflicts: Gemfile.lock app/views/layouts/default.html.erb config/application.rb public/admin/stylesheets/admin.css
* Switch Javascript (bar admin) to be served with the asset piplineMark Longair2013-11-19-0/+53