David Yip 38f6d8130d Eliminate stray conflict markers.

2018-01-20 10:46:43 -06:00

..

core

Fixed improper mailer import

2018-01-15 21:23:26 -08:00

flavours

Port 7badad7797 to glitch frontend

2018-01-18 10:25:37 -06:00

fonts

Theme: Windows 95

2018-01-05 16:22:58 -08:00

images

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

2018-01-20 10:45:43 -06:00

locales

…

mastodon

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

2018-01-20 10:45:43 -06:00

packs

Fix mailer to use webpack core

2018-01-15 21:17:03 -08:00

skins/vanilla/win95

…

styles

Eliminate stray conflict markers.

2018-01-20 10:46:43 -06:00