Wu Sheng 2892a987f5 Merge branch 'master' into 6.0		2018-07-11 14:48:35 -07:00
..
bin	Webapp/login (#1374)	2018-06-20 22:32:12 +08:00
release-docs	Make the icon font things more clear in NOTICE, include where they are in our source folder. Also move the text at the beginning of the distribution NOTICE file. (#1444)	2018-07-11 11:45:16 -07:00
src/main/assembly	Webapp/login (#1374)	2018-06-20 22:32:12 +08:00
pom.xml	Upgrade version to 6.0.0 alpha.	2018-07-07 10:46:41 +08:00