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

Browse Source

Conflicts:
	app/views/admin/ad_images/_form.html.erb

...

This commit is contained in:

Christophe Vilayphiou 2012-04-23 14:08:23 +08:00

parent 67ba2389a2 170c12bcdd

commit d71d0f7e89

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