Commit Graph

2 Commits

Author SHA1 Message Date
chris 09bb318d6a Changes for NTU Student Affairs 2013-09-13 15:10:33 +08:00
chris d766eea9f4 Changes for NTU common
Conflicts:
	lib/tasks/migrate.rake

Conflicts:
	lib/tasks/migrate.rake

Conflicts:
	config/resque_schedule.yml
	lib/tasks/migrate.rake
2013-09-13 15:10:10 +08:00