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
This commit is contained in:
harrybomrah authored and saurabhbhatia committed 2013-07-30 16:43:11 +08:00
1 parent ac58b993c2
commit 5f9190db39
14 files changed
+258 -278

No files matched your search

+3
View File
@@ -4,5 +4,8 @@ class CssDefault < Stylesheet
# belongs_to :desktop_widget
belongs_to :css, polymorphic: true
def content
self.file.read.force_encoding("UTF-8") rescue ''
end
end