diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
| commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
| tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /app/assets/javascripts/alerts/index.js.coffee | |
| parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
| parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) | |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'app/assets/javascripts/alerts/index.js.coffee')
0 files changed, 0 insertions, 0 deletions