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 622c8fdb75
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
7 years ago
..
controllers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
helpers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
javascript Merge pull request #314 from chriswmartin/merge-vanilla-updates-2 7 years ago
lib Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
mailers Add confirmation step for email changes (#6071) 7 years ago
models Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
policies
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 'tootsuite/master' into glitchsoc/master 7 years ago
validators Merge remote-tracking branch 'tootsuite/master' into merge-upstream 7 years ago
views Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
workers Fix PuSH workers (#6200) 7 years ago