User 2 makes a second change on Friday at 15:24, before the earlier pull request has been accepted.
Merge branch 'master' of https://github.com/nsTsoTest2/testPublicRepo into nsTsoTest2-master

Conflicts:
	documents/00001.xml