diff options
author | ThibG <thib@sitedethib.com> | 2019-02-19 22:42:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-19 22:42:22 +0100 |
commit | 787449c12f121737c4319ec274300fa9a330fe9b (patch) | |
tree | 766b37f3f093f3882aba2258ebc2748325edcfcb /lib | |
parent | 896beb16c5318b8ce59867a06545ae6a00ccc84c (diff) | |
parent | ff0576cc2b046694dd8960608ce2f40e32a0ab78 (diff) |
Merge pull request #925 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/version.rb | 2 |
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 |