4 commits

Author	SHA1	Message	Date
Martin Bornhold	488bd2df2f	settings: Add argument to select rebase as merge strategy.	2016-06-27 13:16:10 +02:00
Daniel Dourvaris	bf510fd33c	vcs: make commit datetimes utc	2016-06-09 05:20:58 +03:00
Daniel Dourvaris	dbb993b0d4	logging: log the original error when a merge failure occurs	2016-05-31 16:08:21 +03:00
Marcin Kuzminski	9a0d8c0b77	project: added all source files and assets	2016-05-24 15:56:53 +02:00