Harry Bomrah 46f80ade6a Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit ... Conflicts: vendor/built_in_modules/gallery/config/routes.rb		2012-11-14 16:25:02 +08:00
..
locales	gallery update	2012-10-26 11:15:37 +08:00
routes.rb	Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit	2012-11-14 16:25:02 +08:00