Commit b415a4a90b62c74049ce1d265a060c56167ef736

  • Tree SHA1: 1c3fac4
  • Parent SHA1: c6d359e (Intermediate commit)
  • Parent SHA1: 0d3e547 (Merge branch 'master' of github.com:janastu/mural-annotation)
Merge branch 'master' of https://github.com/janastu/mural-annotation

Resolve Conflicts:
	fetch.py