Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ...

Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml

2018-05-10 00:03:28 +02:00

..

about.js

Do not require images in about.js and share.js (#6622)

2018-03-04 20:27:40 +01:00

application.js

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

common.js

Skins support

2017-11-30 19:29:47 -08:00

public.js

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

share.js

Do not require images in about.js and share.js (#6622)

2018-03-04 20:27:40 +01:00