You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Thibaut Girka 12edfead8e
Do not discard statuses obtained via websocket when API request finishes
7 years ago
..
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
helpers Merge remote-tracking branch 'origin/master' into gs-master 7 years ago
javascript Do not discard statuses obtained via websocket when API request finishes 7 years ago
lib Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
mailers HTML e-mails for NotificationMailer (#6263) 7 years ago
models Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
policies Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
presenters Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
serializers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
services Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
validators Merge remote-tracking branch 'tootsuite/master' into merge-upstream 7 years ago
views Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
workers Fix home regeneration (#6251) 7 years ago