developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509

Browse Source 
Conflicts:
	app/views/layouts/_side_bar.html.erb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-17 06:45:30 +08:00
2 parents 0f354b8ccc 0647698012
commit cd1640482a
3 files changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/models/ad_banner.rb
+1 -1
View File
@@ -3,7 +3,7 @@ class AdBanner
include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes
include OrbitCoreLib::ObjectAuthable
field :title
field :transition_msec,type: Integer
field :ad_fx #TODO Design should explain