3 commits

Author	SHA1	Message	Date
Connor Shea	d8654744cd	Merge branch 'master' into diff-line-comment-vuejs	2016-08-17 12:10:09 -06:00
Connor Shea	1e7cbe0b05	Add documentation for discussion resolution.	2016-08-16 16:05:10 -06:00
Sean McGivern	b79378cae8	Add merge conflict docs	2016-08-12 23:24:49 +03:00