diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-01 21:00:16 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-01 21:00:16 +0100 |
commit | a07e37cc1793f7222b227ca9ecd59e29f0fb0c2a (patch) | |
tree | a175c42ae6cc808f543c73d698eaf451effe93b3 /lib | |
parent | 4b85bf12ab7005a5a6b4472b8aeaf022ce042ad7 (diff) | |
parent | 5648b30d6c61aa22520ca13988206493e0d0f708 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
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 7143d4d00..214c017b3 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 3 + 4 end def pre |