djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-19 09:06:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript
History
Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
2020-07-15 15:32:40 +02:00
..
core
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-01 19:23:14 +02:00
flavours
[Glitch] Fix block/mute pagination in WebUI
2020-07-10 18:49:33 +02:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' into glitch-soc/merge-upstream
2020-05-13 22:11:49 +02: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
2020-07-15 15:32:40 +02:00
packs
Fix lock icon not being shown when locking account in profile settings (#14190)
2020-07-01 13:51:50 +02:00
skins
Port Sylvhem's mastodon-light to glitch flavour
2018-05-07 17:00:02 +02:00
styles
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-07 15:58:45 +02:00