Merge remote-tracking branch 'remotes/upstream/master' into master · project-openubl/openubl-quickstarts@ca4fd8c · GitHub

This repository has been archived by the owner on Jul 21, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'remotes/upstream/master' into master

Browse files

# Conflicts:
#	xbuilder-jee-vanilla/src/main/java/io/github/project/openubl/quickstart/xbuilder/jee/config/UBLConfigSingleton.java
#	xbuilder-quickstart/README.md
#	xbuilder-quickstart/src/main/java/io/github/project/openubl/quickstart/xbuilder/ConfigSingleton.java

Loading branch information

carlosthe19916 committed Dec 7, 2020

2 parents 7dfa917 + dceccf5 commit ca4fd8c