4 commits

Author	SHA1	Message	Date
Jonathan White	1a4303bbce	Added tests for retention of entry history after merge	2017-10-21 22:49:20 -04:00
louib	242faa138b	Add custom icons when merging. (#1008) ... * Adding missing custom icons on merge. * qDebug when adding icon * Adding test for merge custom icons.	2017-10-07 10:40:29 -04:00
louib	8e8d9f39cb	Merge : making sure the group is populated. (#942)	2017-09-20 11:39:10 -04:00
louib	1220b7d501	Feature : Update entries across groups when merging (#807) ... * Feature : Update entries across groups when merging * Styling	2017-09-05 10:28:47 -04:00