"README.md" did not exist on "c0875c19746edb63a9c82659c89cdedb69ced5a6"
Merge remote-tracking branch 'upstream/master'
No related branches found
No related tags found
Showing
- .circleci/config.yml 6 additions, 1 deletion.circleci/config.yml
- CHANGELOG.md 156 additions, 0 deletionsCHANGELOG.md
- Dockerfile 3 additions, 1 deletionDockerfile
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 2 additions, 2 deletionsGemfile.lock
- app/javascript/mastodon/features/getting_started/components/announcements.js 1 addition, 1 deletion...odon/features/getting_started/components/announcements.js
- app/javascript/mastodon/locales/defaultMessages.json 12 additions, 0 deletionsapp/javascript/mastodon/locales/defaultMessages.json
- app/javascript/mastodon/locales/en.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/en.json
- app/javascript/mastodon/reducers/announcements.js 4 additions, 3 deletionsapp/javascript/mastodon/reducers/announcements.js
- app/javascript/mastodon/reducers/statuses.js 1 addition, 2 deletionsapp/javascript/mastodon/reducers/statuses.js
- app/javascript/styles/mastodon/_mixins.scss 2 additions, 1 deletionapp/javascript/styles/mastodon/_mixins.scss
- app/javascript/styles/mastodon/about.scss 2 additions, 1 deletionapp/javascript/styles/mastodon/about.scss
- app/javascript/styles/mastodon/accounts.scss 1 addition, 0 deletionsapp/javascript/styles/mastodon/accounts.scss
- app/javascript/styles/mastodon/admin.scss 50 additions, 3 deletionsapp/javascript/styles/mastodon/admin.scss
- app/javascript/styles/mastodon/components.scss 20 additions, 11 deletionsapp/javascript/styles/mastodon/components.scss
- app/javascript/styles/mastodon/footer.scss 1 addition, 0 deletionsapp/javascript/styles/mastodon/footer.scss
- app/javascript/styles/mastodon/forms.scss 2 additions, 0 deletionsapp/javascript/styles/mastodon/forms.scss
- app/javascript/styles/mastodon/widgets.scss 5 additions, 2 deletionsapp/javascript/styles/mastodon/widgets.scss
- app/views/admin/announcements/_announcement.html.haml 15 additions, 17 deletionsapp/views/admin/announcements/_announcement.html.haml
- app/views/admin/announcements/index.html.haml 2 additions, 10 deletionsapp/views/admin/announcements/index.html.haml
Loading
Please register or sign in to comment