Harry Bomrah 5f9190db39 few updates with fb integration and some other changes in user and supports data to android ... Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb		2013-07-30 16:43:11 +08:00
..
locations_controller.rb	few updates with fb integration and some other changes in user and supports data to android	2013-07-30 16:43:11 +08:00