Peter Jaszkowiak 548e13486d Fix merge conflicts

2016-09-04 17:54:41 -06:00

..

images

default cover photo for groups, #2588

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

language

Latest translations and fallbacks

2016-09-02 09:02:51 -04:00

less

re: #5002

2016-08-31 12:20:51 -04:00

src

Fix merge conflicts

2016-09-04 17:54:41 -06:00

uploads

closes #4256

2016-02-24 11:44:18 +02:00

vendor

fixed app.loadJQueryUI; minified jquery-ui.js; removed jqueryui from cold load payload; fixed broken image paths

2016-08-26 17:31:57 -04:00

503.html

made 503 page mobile responsive

2016-05-30 17:09:29 -04:00

favicon.ico

…

js-enabled.css

Fixing regression from 3e2231d2cb

2016-03-27 18:56:37 -04:00

logo.png

fixes #3940

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