啥也没有改，冒个泡泡。。

Signed-off-by: Jacarri Chan <cj772929989@gmail.com>
ignore target目录
Signed-off-by: jacarrichan <772929989@qq.com>
ignore
Signed-off-by: jacarrichan <772929989@qq.com>
Merge branch 'master' of github.com:jacarrichan/openfire

Conflicts:
	src/jar-list.txt
Merge branch 'devbranch'

Conflicts:
	.gitignore