Jonathan White 14e3d9d576
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	src/core/Group.cpp
2017-10-01 11:10:10 -04:00
..
2015-09-12 13:55:50 +02:00
2017-09-24 18:00:12 -04:00
2016-10-28 18:51:09 +02:00
2016-10-28 18:51:09 +02:00
2015-10-15 18:02:31 +02:00
2017-03-10 16:11:55 +01:00
2015-09-26 11:44:27 +02:00
2016-10-02 21:45:54 -04:00
2016-10-02 21:45:54 -04:00
2017-09-24 18:00:12 -04:00
2017-09-24 18:00:12 -04:00
2016-10-28 18:51:09 +02:00