ThePhD 7e5f2837a8
Merge branch 'develop' into sol3
# Conflicts:
#	include/single/sol/sol.hpp
#	include/single/sol/sol_forward.hpp
2018-11-21 15:06:23 -05:00
..
2018-02-17 00:18:26 -05:00
2018-11-20 11:59:36 -05:00
2018-05-10 05:30:51 -06:00
2018-11-20 11:59:36 -05:00