about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorpluralcafe-docker <git@plural.cafe>2019-01-12 04:24:01 +0000
committerpluralcafe-docker <git@plural.cafe>2019-01-12 04:24:01 +0000
commita6e0ff72f552dc172c18f5a10bbca071b067ab51 (patch)
treef845d5a7e328c3babfde43066325262c1dbdbed0 /lib
parent74134e490c49d8a7d88cc69720e22cd88cee9233 (diff)
parent2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/version.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 56e02cf6c..167a309ab 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,11 +9,11 @@ module Mastodon
     end
 
     def minor
-      6
+      7
     end
 
     def patch
-      5
+      0
     end
 
     def pre
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      ''
+      'rc1'
     end
 
     def to_a