Christophe Vilayphiou f65bb9b323 Merge branch 'master' into desktop_harry ... Conflicts: app/assets/stylesheets/style.css.erb		2012-04-06 19:02:39 +08:00
..
_drop_down_menu.html.erb	brief starting for dashboard,adds i18n vars	2012-02-15 00:34:21 +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	Ray's changes for orbit bar	2012-04-06 18:06:57 +08:00
_side_bar.html.erb	Missing end tag in side_bar	2012-04-05 18:13:52 +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
desktop.html.erb	Desktop Commit	2012-04-06 17:47:02 +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