{"shas":[["b002159638f3629d6639f9aa120983efc9eee6fc","7f28c082beb6736f56ae294f659af65d84e1d556@ucalgary.ca","Fix a merge problem with the dynamic files in cindy's merge","Shaun Phillips"],["3dcce6a5bfbdf1b0f8edc3851cfdc0469c223891","8608e0e0e9940c239ce99a918313455f2b22b38e@hotmail.com","Merge branch 'master' of github.com:shaunph/CourseProject","Chris Nguyen"],["9b4ab6744b1f1ce23c1bfaedfa9ee230419517ef","8608e0e0e9940c239ce99a918313455f2b22b38e@hotmail.com","changed method to display error pages","Chris Nguyen"],["4c5c3ff0fa93fe1ab1fc984e20c247971b790aee","8608e0e0e9940c239ce99a918313455f2b22b38e@hotmail.com","Changed tabs to whitespace","Chris Nguyen"],["a81527177561059a4b33775582dbeba7462a60f6","8608e0e0e9940c239ce99a918313455f2b22b38e@hotmail.com","Removed deprecated function to view a task","Chris Nguyen"],["85574bbea618585188ada7509e22b235fab9797b","6c0bb5454ca56ab66b3726c0ae43fbbcb2fbdd9e@gmail.com","Merge branch 'master' of http://github.com/masudio/CourseProject into masudio-master","Adam Kromm"],["28b2117a5824ca2c38c4b12b3c40256d26746c18","a9678ee27053c6303d121dcae0b7c3d1adf9763a@ucalgary.ca","Merge branch 'master' of github.com:cngu/CourseProject\n\nConflicts:\n\tsrc/static/index.html","Jeremy Jackins"],["460a4273388bf8a05fad58d0044a8ca074140a9f","eaa5ae77e7e68a69743b4660a4df83dcd8a5e831@ucalgary.ca","Fixed paths, scripts, etc. Closes PT issue 'DB uses current working directory'","Charles DeBavelaere"],["e7f67a81b8b49581338294f3d73f19f4f8c191a0","eaa5ae77e7e68a69743b4660a4df83dcd8a5e831@ucalgary.ca","Small changes","Charles DeBavelaere"],["5a4805f9f44ffb6e97f1f07599e6bab800641722","eaa5ae77e7e68a69743b4660a4df83dcd8a5e831@ucalgary.ca","Fixed one line in createDatabase","Charles DeBavelaere"],["dd303ea915ef13b8db4413840428d5fa13cf0fef","6be50c21fdeeb1be064b74458b811b73b4dfdf26@hotmail.com","Merge branch 'master' of github.com:shaunph/CourseProject","turiyag"]],"repo":"masudio/CourseProject","actor":"masudio","ref":"refs/heads/master","size":11,"head":"dd303ea915ef13b8db4413840428d5fa13cf0fef","actor_gravatar":"fab84c1f2a074a1d542f832966b3c159","push_id":27967362}