Ondřej Hruška b769f9c0df fix custom emoji not shown in statuses		2017-09-28 10:13:16 +02:00
..
controllers	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
helpers	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
javascript	fix custom emoji not shown in statuses	2017-09-28 10:13:16 +02:00
lib	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
mailers	Thread toot notification mails by conversation (#5061)	2017-09-24 11:19:42 +02:00
models	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
policies	Add status destroy authorization to policy (#3453)	2017-05-30 22:56:31 +02:00
presenters	Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream	2017-09-28 09:18:35 +02:00
serializers	Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream	2017-09-28 09:18:35 +02:00
services	Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream	2017-09-28 09:18:35 +02:00
validators	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	2017-09-28 09:12:17 +02:00
views	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
workers	Follow-up to #4582 and #5027, removing dead code (#5101)	2017-09-26 01:06:27 +02:00