about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-09 05:17:13 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-09 05:17:13 +0000
commit7c719c567cb5c4fef0b04c7659b894cabec5a0ac (patch)
treee28e6607fa12b007f0488bace0c19bc58fa022f1 /lib
parent488381ae2f19cbe37700745d0f97590e84c9b9d1 (diff)
parent628358aeea65587c2862b9fab67a9d18cb52ce93 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'lib')
-rw-r--r--lib/mastodon/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index bd23ab1d1..5936b5fcf 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      2
+      3
     end
 
     def pre