knop-project / knop

Web application framework for Lasso 8 and 9
18 stars 46 forks source link

Merged Jolle's changes to the master branch. There were some conflicts that could not be automatically resolved. #63

Closed stevepiercy closed 12 years ago

stevepiercy commented 12 years ago

Manually merged Jolle's changes to the master branch, as conflicts prevented automatic merge.