Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into diff-line-comment-vuejs | Connor Shea | 2016-08-17 | 3 | -0/+41 |
|\ | |||||
| * | Reference the version 'UI resolve conflicts' was introduced | Achilleas Pipinellis | 2016-08-17 | 1 | -0/+4 |
| * | Add merge conflict docs | Sean McGivern | 2016-08-12 | 3 | -0/+37 |
* | Add documentation for discussion resolution. | Connor Shea | 2016-08-16 | 6 | -8/+40 |
* | Init commit on documentation for resolving inline comments in MRs | Achilleas Pipinellis | 2016-08-17 | 1 | -0/+8 |