ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
 		2018-11-27 13:23:02 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
flavours Update MediaGallery and Video props when folding/unfolding CWs in detailed statuses 2018-11-25 11:29:56 +01:00
fonts
…
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
…
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01: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 2018-11-27 13:23:02 +01:00