Merge branch 'develop' into feature/114_show_company_on_lectors_page

Conflicts: app/views/web/lectors/index.html.haml
nastachku · Feb 22, 2013 · e4e303e · e4e303e
2 parents 545d883 + bb2e4d1
commit e4e303e
Show file tree

Hide file tree

Showing 10 changed files with 340 additions and 321 deletions.
diff --git a/app/assets/javascripts/admin/chosen-selects.js.coffee b/app/assets/javascripts/admin/chosen-selects.js.coffee
@@ -1,4 +1,4 @@
   # enable chosen js
   $('.chosen-select').chosen
-#    allow_single_deselect: true
+    allow_single_deselect: true
     no_results_text: 'Ничего не найдено по запросу'