about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-02-19 20:18:40 +0100
committerThibaut Girka <thib@sitedethib.com>2019-02-19 20:18:40 +0100
commitff0576cc2b046694dd8960608ce2f40e32a0ab78 (patch)
tree766b37f3f093f3882aba2258ebc2748325edcfcb /lib
parent896beb16c5318b8ce59867a06545ae6a00ccc84c (diff)
parent8e7fc7ec73c0743df378403ad2e704c9fae70400 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
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 fad5b5c47..6911fef0d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      2
     end
 
     def pre