Merge branch 'js_improve'

This commit is contained in:
yafeilee 2014-06-24 20:44:06 +08:00
commit 08ab6051f7
1 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,7 @@
//= require jquery
//= require jquery_ujs
//= require foundation
//= require foundation/foundation
//= require foundation/foundation.offcanvas
//= require angularjs
//= require 'jquery.html5-fileupload'
//= require_tree .