Andrew DeMaria 7c19e9f4ab Merge branch 'stable' into develop ...

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>

Conflicts:
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml

2017-05-04 17:38:42 -06:00

..

contrib

Added doc from @texneues for https on tomcat and freebsd

2017-03-23 20:41:33 -06:00

developer

Losslessly recompress PNG files using ECT

2017-04-26 16:42:32 +08:00

CONFIGURATION.md

Added some notes about spring boot parameters

2017-04-06 16:38:52 -05:00

DATABASE.md

Added missing digit

2017-04-02 21:56:44 -06:00

FreeBSD-FreeNAS-Install.md

Merge 6.1.beta2 into stable

2016-11-27 18:53:36 +00:00

INSTALL.md

Update install doc WAR file url to v6.2

2017-05-03 00:14:39 +02:00

MIGRATE.md

Doc: Move build and migration docs to documentation/

2016-12-07 23:25:19 +01:00

PROXY.md

Update PROXY.md

2017-03-29 02:40:59 -04:00

TRANSCODE.md

Fix link

2017-02-26 13:56:36 -07:00