diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-31 11:15:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 11:15:37 +0100 |
| commit | a78ec63afa100a25494427ac3695e51e99520c2b (patch) | |
| tree | 28f8a4165549a8406abf791a31d05f53a73f051f /lib | |
| parent | 2b2facbbdfb7c0b53e38048e932143d592af401e (diff) | |
| parent | 75b48dc1771f805f43c9dd2d55fc32ccf8951d68 (diff) | |
Merge pull request #803 from ThibG/glitch-soc/merge-upstream
Merge upstream changes (v2.6.1)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/version.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 2b38ae05b..60c4ffaa6 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 0 + 1 end def pre @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc4' + '' end def to_a |