Bende
Merge remote-tracking branch 'origin/detailpage' into test
Eindelijk
merge
HOI
Merge branch 'test' of https://github.com/utwente-di/di10 into test
Browse, BrowseTest updated
Hiero
Merge branch 'artwork' of https://github.com/utwente-di/di10.git into artwork
Merge branch 'master' into detailpage
Merge branch 'artwork' of https://github.com/utwente-di/di10.git into artwork
db schema
DEze BeNdE
artwork update stuff
debug output
Merge branch 'master' of github.com:utwente-di/di10
addArtwork updated.
InsertArtwork updated, UpdateArtwork updated && addArtwork.jsp updated
Updated DeleteArtwork, web.xml and UpdateArtwork. The only thing that
still needs to be done is making a connection between the detailpage and
either the update/delete function.
Merge branch 'master' of github.com:utwente-di/di10