wmcheng e76fb42be6 Merge branch 'master' into 'master' ... # Conflicts: # app/controllers/galleries_controller.rb		2019-11-05 23:53:44 +08:00
..
admin	fix error	2019-11-05 21:21:00 +08:00
.keep	Gallery Initial app	2014-05-01 14:33:52 +08:00
galleries_controller.rb	Merge branch 'master' into 'master'	2019-11-05 23:53:44 +08:00