wmcheng e76fb42be6 Merge branch 'master' into 'master' ... # Conflicts: # app/controllers/galleries_controller.rb		2019-11-05 23:53:44 +08:00
..
assets	Update gallery.js	2019-10-30 22:34:41 +08:00
controllers	Merge branch 'master' into 'master'	2019-11-05 23:53:44 +08:00
helpers	import from excel for albums	2016-12-20 19:43:54 +08:00
mailers	Gallery Initial app	2014-05-01 14:33:52 +08:00
models	fix recreate thumb problem	2019-11-05 21:14:34 +08:00
uploaders	fix multiple thread processing picture feature	2019-10-26 15:36:04 +08:00
views	fix recreate thumb problem	2019-11-05 21:14:34 +08:00