diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-30 22:37:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-30 22:37:58 +0100 |
| commit | 3cbe0c26bbc2a9a70542ca6d43336d06aae8f42d (patch) | |
| tree | 750732633da28b3ed719883ee00db0593fb44fde /lib | |
| parent | 76320bf6d8ff09cfbea911a5d0f466aa160d313f (diff) | |
| parent | bc8411ec870e579bd2411827f3b8a1d4ecf44796 (diff) | |
Merge pull request #837 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 bc4712d9a..7143d4d00 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 2 + 3 end def pre |