updated files from desktop
delete .idea and add to git ignore
merge changes from master branch
now working as expected after wonky merge
completes all the main ticket actions
add resolve ticket section and show resolve status in ticket table
fix really bad grammar
remove test session code
Merge branch 'linux-desktop/develop' of github.com:gavinmcmaster/ticket-tracker into windows-laptop/develop
update links to desktop localhost
add edit comment button
wip edit comments
sorts edit ticket comment feature
add required db columns for attachments feature
start adding file upload feature - wip
cherry pick merge
remove conflict pointers from previous merge
add required db columns for attachments feature
start adding file upload feature - wip
set up attachments working