p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
bigdir/config/locales
History
yanxd 70abac4c1e Merge branch 'competition' into develop 
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
 		2014-06-13 10:59:43 +08:00
..
en.yml Merge branch 'competition' into develop 2014-06-13 10:59:43 +08:00
zh.yml Merge branch 'competition' into develop 2014-06-13 10:59:43 +08:00