beginning of main
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into mainprogram
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into mainprogram
javadocia yms
confliktisäätö
huh huh
main + pdf process changes
attachment bugfix
Merge branch 'kirjoita' into development
conflict resolved
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into development
abc
main 'done'
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into development
qrreader 'fixed'
tests changed to match code changes
delete old messages works
interface updated
some tweeks
unohdus