David Yip d3f64812a6

Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update ...

Conflicts:
	app/javascript/styles/win95.scss
	config/themes.yml

2018-01-18 10:54:12 -06:00

..

controllers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

helpers

Merge remote-tracking branch 'origin/master' into gs-master

2018-01-15 22:17:48 -06:00

javascript

Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update

2018-01-18 10:54:12 -06:00

lib

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-09 14:16:45 -06:00

mailers

HTML e-mails for NotificationMailer (#6263)

2018-01-16 20:20:15 +01:00

models

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-15 06:17:15 +00:00

policies

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-02 14:17:11 +00:00

presenters

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

serializers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

services

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-15 06:17:15 +00:00

validators

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

views

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00

workers

Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)

2018-01-15 04:34:28 +01:00