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 | |
| 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')
| -rw-r--r-- | app/assets/javascripts/main/homepage.js.coffee (renamed from app/assets/javascripts/static/homepage.js.coffee) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/static.js.coffee | 3 |
2 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/javascripts/static/homepage.js.coffee b/app/assets/javascripts/main/homepage.js.coffee index e69de29..e69de29 100644 --- a/app/assets/javascripts/static/homepage.js.coffee +++ b/app/assets/javascripts/main/homepage.js.coffee diff --git a/app/assets/javascripts/static.js.coffee b/app/assets/javascripts/static.js.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/static.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ |