diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-11 19:53:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 19:53:43 +0200 |
| commit | 017628fd003e17df7ae28fe62db64abd2e6f680e (patch) | |
| tree | c6cad9011fd1900dc1062b67b0db400418832ce8 /lib | |
| parent | 612b00d1bb91c6b11f00fdb273dd8cd2ca883b12 (diff) | |
| parent | 6f0f583abeb34737f01defab5cdee7b626447f5e (diff) | |
Merge pull request #567 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 60739d40e..62e55d32d 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc2' + '' end def to_a |