Christophe Vilayphiou cd1640482a Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 ... Conflicts: app/views/layouts/_side_bar.html.erb		2012-05-17 06:45:30 +08:00
..
assets	AdBanner reopen new banner and delete. Rename title with content editable tag.	2012-05-17 06:44:14 +08:00
controllers	Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509	2012-05-17 06:45:30 +08:00
helpers	Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509	2012-05-17 06:45:30 +08:00
jobs	Restart job	2012-05-14 00:50:36 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509	2012-05-17 06:45:30 +08:00
uploaders	Change assets	2012-05-16 11:07:11 +08:00
views	fix ad_image size hints. fix orbit backend controller error when changing language.	2012-05-17 06:44:14 +08:00