Allen Cheng 3d6f57086b Merge branch 'master' into 'master' ... # Conflicts: # app/models/book.rb		2019-08-16 13:03:39 +08:00
..
assets	fix desktop pic	2015-01-14 13:52:36 +08:00
controllers	Update personal_books_controller.rb	2019-08-15 10:48:15 +08:00
helpers	charts and excel export added to books	2016-06-04 15:41:10 +08:00
mailers	Personal Book first commit	2014-06-04 17:38:58 +08:00
models	Merge branch 'master' into 'master'	2019-08-16 13:03:39 +08:00
views	Update _form.html.erb start_year plus 5 for publication year selection tab	2018-11-30 19:54:44 +08:00