developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-04-24 02:37:03 +08:00
2 parents 4f87165039 a748ccaac7
commit d4aea664e2
15 files changed
+167 -95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/models/page_part.rb
+1 -1
View File
@@ -7,7 +7,7 @@ class PagePart
field :content
field :kind
field :public_r_tag
field :public_r_tag_object_id, :type => BSON::ObjectId, :default => nil
field :public_r_tag_object_id, :default => nil
field :widget_path
has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy