diff options
author | ThibG <thib@sitedethib.com> | 2019-06-13 23:53:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-13 23:53:21 +0200 |
commit | c0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (patch) | |
tree | cf6ad8df684977b10ffd0d4a313d6dccb42ac15a /lib | |
parent | 80849812d2a03ff9da671a2204bacf0c85f6ab0d (diff) | |
parent | 0fd7a8b63d6247ff1fe1d305ec712c0a519a52f1 (diff) |
Merge pull request #1111 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 ae945a987..56b846a36 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc1' + '' end def to_a |