Christophe Vilayphiou e88b09cf72 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit ... Conflicts: app/controllers/pages_controller.rb app/views/layouts/_side_bar.html.erb lib/parsers/parser_common.rb vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendor/built_in_modules/gallery/config/locales/en.yml vendor/built_in_modules/gallery/config/locales/zh_tw.yml		2012-09-12 02:21:18 +08:00
..
assets	design update	2012-09-12 01:58:23 +08:00
controllers	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-12 02:21:18 +08:00
helpers	Merge branch 'master' of github.com:Rulingcom/NCCU	2012-08-14 01:00:25 +08:00
jobs	NCCU 上傳版本 0709	2012-07-09 16:02:59 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	design update	2012-09-12 01:58:23 +08:00
uploaders	gallery frontend update	2012-09-12 02:05:10 +08:00
views	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-12 02:21:18 +08:00