luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 11:33:36 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
flavours Fix mention links in detailed statuses not opening in the WebUI 2018-12-06 15:31:21 +01:00
fonts
images
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 2018-12-06 12:44:38 +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 2018-12-09 16:08:04 +01:00