snipe 4c5f20fde4 Merge branch 'develop' ...

# Conflicts:
#	app/Importer/Importer.php
#	config/version.php

2018-04-23 13:33:34 -07:00

..

_debugbar/assets

Version 3 - hold onto your butts

2016-03-25 01:18:05 -07:00

assets/css/themes

Removed unused skin files, added skin setting option

2018-03-02 17:50:40 -08:00

css

Additional rules for non-green skins

2018-04-23 13:30:32 -07:00

img

Seed with demo images

2017-10-28 05:46:43 -07:00

js

Move first_name and last_name to only be displayed for user importer. Also sort items alphabetically regardless of their source. (#5292)

2018-03-30 19:32:43 -07:00

uploads

Seed with demo images

2017-10-28 05:46:43 -07:00

.htaccess

Update some composer dependencies to try to fix everything breaking in subdirectories. Attempts to fix #4052, it seems to help here. (#4078)

2017-09-29 17:05:20 -07:00

favicon.ico

Added favicon

2016-07-10 18:53:25 -07:00

index.php

Updated email addy

2016-12-14 04:38:03 -08:00

mix-manifest.json

Move first_name and last_name to only be displayed for user importer. Also sort items alphabetically regardless of their source. (#5292)

2018-03-30 19:32:43 -07:00

robots.txt

Disallow / in robots

2017-09-28 17:47:48 -07:00

web.config

Fix for IIS+ Chrome not showing webfonts

2017-11-06 16:51:46 -08:00