]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'gs-master' into prevent-local-only-federation
authorDavid Yip <yipdw@member.fsf.org>
Fri, 15 Dec 2017 18:20:56 +0000 (12:20 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Fri, 15 Dec 2017 18:20:56 +0000 (12:20 -0600)
commit82b2e224a26765caf743b24844912faa2de9873a
tree1ee49dd3dbcef7867ad93f875262951612815851
parent6abb0950c6f694607cdc6a0c564751400d52ad5a
parente0a573a2cef924fdfec2cd7ec96a712fe2de1511
Merge branch 'gs-master' into prevent-local-only-federation

 Conflicts:
db/schema.rb
db/schema.rb