Merge branch 'master' into glitch-soc/merge

This commit is contained in:
Thibaut Girka committed 2018-05-14 20:51:50 +02:00
commit ba7ee67498
36 files changed
+314 -260

No files matched your search

+1 -1
View File
@@ -21,7 +21,7 @@ module Mastodon
end
def flags
'rc1'
'rc3'
end
def to_a