luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 19:44:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
flavours Fix crash when clearing uninitialized timeline 2018-12-30 16:56:55 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
packs Escape HTML in profile name preview in profile settings (#9446) 2018-12-07 16:42:22 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00