djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/mastodon/features/compose
History
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
 		2019-08-29 12:07:50 +02:00
..
components Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
containers Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00