orbit-basic/app/views
Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	app/views/admin/sites/site_info.html.erb
2012-05-07 16:08:05 +08:00
..
admin Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-07 16:08:05 +08:00
devise Change for the notice msg at login page 2012-04-30 00:24:10 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
layouts Add site_info 2012-05-07 00:54:18 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00