Merge branch 'develop' into sol3

# Conflicts:
#	.gitignore
#	single/include/sol/forward.hpp
#	single/include/sol/sol.hpp
#	single/sol.hpp
#	single/sol/sol.hpp
#	single/sol/sol_forward.hpp
#	single/sol_forward.hpp
This commit is contained in:
ThePhD 2019-01-21 11:40:22 -05:00
commit 56fd896bed
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "Catch"]
path = Catch
url = https://github.com/philsquared/Catch.git