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.
David Yip 42f2045c21
Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
..
controllers Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 7 years ago
helpers Swedish translation (#5406) 7 years ago
javascript Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 7 years ago
lib hide mentions of muted accounts (in home col) (#190) 7 years ago
mailers Supply @instance variable in password reset instructions / password change mailer (#5215) 7 years ago
models Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 7 years ago
policies try to tighten up local only toot stuff, like... properly (#163) 7 years ago
presenters Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 7 years ago
serializers Merge remote-tracking branch 'upstream/master' into gs-master 7 years ago
services Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 7 years ago
validators Merge upstream 2.0ish #165 7 years ago
views Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline 7 years ago
workers Clean up reblog tracking keys, related improvements (#5428) 7 years ago