Commit graph

3 commits

Author SHA1 Message Date
Lance Edgar ecdf9b6926 Tweak merge template 2016-11-09 14:15:16 -06:00
Lance Edgar ba1fa6d617 Tweak verbiage for merge template etc. 2016-11-09 02:17:01 -06:00
Lance Edgar 06b0b13992 Add basic merge feature to MasterView 2016-10-28 10:26:37 -05:00