fix conflict as described in issue #23#24
Open
tlkahn wants to merge 1 commit intotechnosophos:masterfrom
tlkahn:master
Open
fix conflict as described in issue #23#24tlkahn wants to merge 1 commit intotechnosophos:masterfrom tlkahn:master
tlkahn wants to merge 1 commit intotechnosophos:masterfrom
tlkahn:master
Commits
Commits on Jun 14, 2016
- committed
