Peter Jaszkowiak 23540afaeb Resolve merge conflicts

2017-02-18 19:14:39 -07:00

..

images

default cover photo for groups, #2588

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

language

Latest translations and fallbacks

2017-02-17 09:22:25 +00:00

less

Option to upload without cropping (#5447)

2017-02-14 16:31:51 -05:00

src

Resolve merge conflicts

2017-02-18 19:14:39 -07:00

uploads

tweak gitignores, closes #5250

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

vendor

Fix ACP layout on tablets

2017-02-03 22:12:47 +00:00

.eslintrc

ESlint no-undef, remove global comments

2017-02-17 22:03:55 -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

…

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