Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts: app/assets/javascripts/application.js
2014-02-09 23:07:38 +01:00
parent 825dc23de1 bb8f427f95
commit 98d3032850
13 changed files with 223 additions and 65 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,6 +12,13 @@
 //
 //= require jquery
 //= require jquery_ujs
+<<<<<<< HEAD
+=======
+//= require jquery.ui.all
+// require jquery.ui.draggable
+// require jquery.ui.sortable
+// require jquery.sortable
+>>>>>>> bb8f427f953c2bcf84331b4eb1f8b5c7108e80e6
 // require jquery-ui
 //= require_tree .
 //= require tinymce-jquery