tree b3deb212774d73fa85db2b05269f8b917e1f3aab
parent 518af5ed565583025b3d444f964f9cafdbd37524
parent 88f02b99f0a286e37115fd7a7a18d7d7d5d07224
author snoopdave@gmail.com <snoopdave@gmail.com> 1558300623 -0400
committer snoopdave@gmail.com <snoopdave@gmail.com> 1558300623 -0400

Merge branch 'master' into bootstrap-ui

# Conflicts:
#	.gitignore
#	app/pom.xml
#	app/src/main/resources/struts.xml
#	pom.xml