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

Browse Source

Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb

...

This commit is contained in:

Christophe Vilayphiou 2012-04-26 17:15:11 +08:00

parent 4af2068c1f 0fcafc2418

commit 9717dd8fe7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available