merge master into autocomplete-aliased-tags

2015-04-07 15:00:39 -04:00
parent 05d382e66e 069648556b
commit af8cae1ef0
15 changed files with 33 additions and 87 deletions
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -4,7 +4,7 @@ module Danbooru
  class Configuration
    # The version of this Danbooru.
    def version
-      "2.75.3"
+      "2.76.0"
    end

    # The name of this Danbooru.