2 Commits

Author	SHA1	Message	Date
chris	d2602a3a84	Change code for new page slide.js ... Conflicts: app/views/admin/pages/_form.html.erb	2013-10-19 19:14:14 +08:00
saurabhbhatia	7c64e8c637	Updated AdBanner index page and Ad Image index page, and edit pages ... Conflicts: vendor/built_in_modules/ad_banner/config/locales/en.yml vendor/built_in_modules/ad_banner/init.rb	2013-08-09 15:22:06 +08:00