Merge branch 'master' into 'master'

# Conflicts: # app/models/book.rb
2019-08-16 13:03:39 +08:00 · 2019-08-16 13:03:39 +08:00 · 3d6f57086b
parent ad892f6e0f 91f2c9c9fd
commit 3d6f57086b
1 changed files with 1 additions and 1 deletions
--- a/app/models/book.rb
+++ b/app/models/book.rb
@ -197,4 +197,4 @@ class Book
      self.url = 'http://' + self.url
    end
  end
-end
+end