harrybomrah 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

..

connections.html.erb

few updates with fb integration and some other changes in user and supports data to android

2013-07-30 16:43:11 +08:00

sections.html.erb

devin's new branch

2013-04-17 14:14:24 +08:00

themes.html.erb

simple component update

2013-07-30 16:43:09 +08:00