diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 15:10:58 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 15:10:58 +0100 |
commit | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (patch) | |
tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /lib | |
parent | f969eca07e2ac7b601694c463ef7097b787bbf65 (diff) | |
parent | 637d0ed8380442e95696e0b9769ba304afb22cd5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
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 60c4ffaa6..bc4712d9a 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 1 + 2 end def pre |