Peter Jaszkowiak a8add6477c Fix merge conflicts

2017-04-12 21:29:54 -06:00

..

images

default cover photo for groups, #2588

2015-01-12 21:14:00 -05:00

language

Latest translations and fallbacks

2017-04-11 09:22:21 +00:00

less

Use npm bootstrap

2017-04-08 19:05:10 -06:00

src

Fix merge conflicts

2017-04-12 21:29:54 -06:00

uploads

tweak gitignores, closes #5250

2016-12-05 10:32:44 -05:00

vendor

buzz is no longer used

2017-04-08 19:05:10 -06:00

.eslintrc

Resolve merge conflicts, minify only .js files

2017-02-23 18:31:49 -07:00

.jshintrc

ESlint no-undef, remove global comments

2017-02-17 22:03:55 -07:00

503.html

fix mixed content warning on 503 status page and installer

2016-09-15 20:17:04 +02:00

favicon.ico

added favicon

2013-06-28 15:56:44 -04:00

js-enabled.css

fixes #5141

2016-10-21 11:26:24 -04:00

logo.png

fixes #3940

2015-12-14 14:28:27 -05:00