1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 17:45:10 +01:00
Commit Graph

3 Commits

Author SHA1 Message Date
diminator
bf0a36f2a3 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
Conflicts:
	js/components/ascribe_detail/edition.js
2015-07-09 14:59:16 +01:00
diminator
fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
Conflicts:
	js/components/ascribe_detail/edition.js
2015-07-09 14:54:11 +01:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00