diff options
author | ThibG <thib@sitedethib.com> | 2020-02-27 12:38:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-27 12:38:17 +0100 |
commit | e1d29f7d9f85a25af7a1595d2c9afc127ab36ca7 (patch) | |
tree | 1381461584bc328a90a2f881345e64ba990120d8 /lib | |
parent | 9ee8e1add9f937a75c2514ca88958ff02cf5573c (diff) | |
parent | 51d326f852baaa1b1c3790549e0d5941a4c13778 (diff) |
Merge pull request #1290 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 a83e4da62..49fe73043 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 1 + 2 end def flags |