]> cat aescling's git repositories - mastodon.git/commitdiff
cat aescling's git repositories / mastodon.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6abb095 e0a573a)
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)
 Conflicts:
db/schema.rb

1  2 
db/schema.rb patch | diff1 | diff2 | blob | history

diff --cc db/schema.rb
Simple merge
source code fur Kibicat Mastodon