]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'origin/master' into gs-master
authorDavid Yip <yipdw@member.fsf.org>
Mon, 27 Nov 2017 17:29:04 +0000 (11:29 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Mon, 27 Nov 2017 17:29:04 +0000 (11:29 -0600)
commite77c3996a513a45e5cad368b0053459f303c60cb
tree923411336e4207bb95c17c90c79f19dabb4d62e2
parent5de42665d77431def632ca8fb8665082027c60a5
parent1c5b0e333464d8da3de73e4886502c816cb8173e
Merge remote-tracking branch 'origin/master' into gs-master
config/locales/en.yml
config/navigation.rb
config/routes.rb
config/settings.yml
db/schema.rb