7 Commits

Author	SHA1	Message	Date
benweet	e9fe7014b8	Updated icons for conflicts	2014-04-03 00:35:07 +01:00
benweet	b543e85779	Fixed sync merge	2014-03-31 01:10:28 +01:00
benweet	4ae6e540d4	Fixed sync merge	2014-03-30 02:44:51 +01:00
benweet	acebad8a65	Implemented sync merge	2014-03-29 01:22:24 +00:00
benweet	0e5f198270	Implement merge in sync providers	2014-03-28 00:49:49 +00:00
benweet	291240d06e	Secondary Google account (part4)	2013-12-23 23:33:33 +01:00
benweet	8f8eccda96	Refactor resource location	2013-10-06 21:26:11 +01:00