]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into gs-master
authorDavid Yip <yipdw@member.fsf.org>
Fri, 27 Oct 2017 14:45:25 +0000 (09:45 -0500)
committerDavid Yip <yipdw@member.fsf.org>
Fri, 27 Oct 2017 14:45:25 +0000 (09:45 -0500)
1  2 
config/locales/en.yml
config/routes.rb
db/schema.rb

Simple merge
Simple merge
diff --cc db/schema.rb
Simple merge
This page took 0.046727 seconds and 4 git commands to generate.