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
..
assets	widget update	2012-11-14 15:28:55 +08:00
controllers	Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit	2012-11-14 16:25:02 +08:00
helpers	authorization	2012-08-11 17:28:49 +08:00
mailers	gallery module update	2012-07-16 20:26:04 +08:00
models	Modifications in ruby	2012-09-12 02:07:40 +08:00
views	widget update	2012-11-14 15:28:55 +08:00