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

..

assets

Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

2013-01-24 16:30:02 +08:00

controllers

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

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

helpers

Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

2013-01-24 16:30:02 +08:00

mailers

gprs byebye, location have two language, must have picture, long, lang have limit

2013-01-16 01:35:38 +08:00

models

Updated zh_tw translation for sidebar labels

2013-07-22 12:17:31 +08:00

uploaders

gprs byebye, location have two language, must have picture, long, lang have limit

2013-01-16 01:35:38 +08:00

views

Updated zh_tw translation for sidebar labels

2013-07-22 12:17:31 +08:00