diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-27 21:26:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 21:26:03 +0200 |
| commit | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (patch) | |
| tree | 4ee42aa7195fd98de901dd73947e4eda2f195015 /lib | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 6d60701bfaa3a4b2bc168ea413c8f0c8e1545526 (diff) | |
Merge pull request #1072 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 b2eec94e6..c986d711b 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 2 + 4 end def pre |