orbit-basic/app/views/layouts
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +08:00
..
_drop_down_menu.html.erb Delete useless code in items 2012-04-12 18:13:10 +08:00
_lang_menu.html.erb Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
_orbit_bar.html.erb Merge branch 'master' into ldap 2012-04-12 18:50:48 +08:00
_side_bar.html.erb Fix side_bar. 2012-04-12 18:14:00 +08:00
admin.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
application.html.erb Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
devise.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
module_widget.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
new_admin.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
page_layout.html.erb Trying nokogiri 2012-03-27 18:42:22 +08:00
panel.html.erb Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
site_editor.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00