prgres 1999d4cb12 Merge remote-tracking branch 'starskiRepo/backend' ... # Conflicts: # README.md		2019-01-23 21:56:34 +01:00
..
main/java/com/dino/scrum/sysmag	Merge remote-tracking branch 'starskiRepo/backend'	2019-01-23 21:56:34 +01:00
test/java/com/dino/scrum/sysmag	fix ignore	2019-01-22 04:38:43 +01:00