David Yip f72ad67a39 Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification ... Avatar unification, mk.II		2017-10-16 00:49:05 -05:00
..
controllers	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
helpers	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
javascript	Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification	2017-10-16 00:49:05 -05:00
lib	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
mailers	Supply @instance variable in password reset instructions / password change mailer (#5215)	2017-10-04 13:25:24 +02:00
models	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
policies	try to tighten up local only toot stuff, like... properly (#163)	2017-10-09 09:56:17 -04:00
presenters	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
serializers	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
services	Restore variable assignment in MuteService#call.	2017-10-12 04:27:45 -05:00
validators	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
views	add duck beaks in haml	2017-10-11 21:34:00 +02:00
workers	Set snowflake IDs for backdated statuses (#5260)	2017-10-08 17:34:34 +02:00