Commit Graph

1 Commits

Author SHA1 Message Date
Lars Tabro Sørensen
7a6b988f8a Fixed broken conventions. Wrote a integrationstests that performs an actual merge between two branches. 2015-01-31 23:15:26 +01:00