]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'gs-master' into glitch-theme
authorDavid Yip <yipdw@member.fsf.org>
Mon, 4 Dec 2017 17:07:01 +0000 (11:07 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Mon, 4 Dec 2017 17:07:01 +0000 (11:07 -0600)
commitd9800a5647cbc57db7679094b2271f8eb5ec328b
treef9210c465de5f9d80e294d9ffa8536f98f9c466e
parent1c74ede69e7a9916c19da6f05daa215231eba81c
parentf2f2f1032082d6212771bd0307136484f671d37e
Merge branch 'gs-master' into glitch-theme
16 files changed:
app/controllers/admin/base_controller.rb
app/controllers/auth/registrations_controller.rb
app/javascript/flavours/glitch/components/status.js
app/javascript/flavours/glitch/containers/status_container.js
app/javascript/flavours/glitch/features/notifications/components/follow.js
app/javascript/flavours/glitch/features/notifications/components/notification.js
app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
app/javascript/flavours/glitch/features/status/components/detailed_status.js
app/javascript/flavours/glitch/features/status/index.js
app/javascript/flavours/glitch/features/ui/index.js
app/javascript/flavours/glitch/styles/_mixins.scss
app/javascript/flavours/glitch/styles/components.scss
app/javascript/styles/mastodon/components.scss
app/models/user.rb
config/locales/simple_form.en.yml
config/settings.yml