Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou committed 2012-05-10 10:34:28 +08:00
commit 87449ec6a8
8 files changed
+17 -10

No files matched your search

+3 -1
View File
@@ -12,4 +12,6 @@
//= require orbit-1.0
//= require orbit-bar-search
//= require side_bar_history
//= require page_edit
//= require page_edit
//= require tinymce-jquery
//= require tinymce_orbit