Commit Graph

3 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
ac0ee5f3f0 in-between tree commits 2016-02-04 17:38:14 -08:00
Galen Wolfe-Pauly
2a95c443ed Merge branch 'factor' of github.com:ohAitch/urbit into factor
Conflicts:
	urb/zod/web/tree/main.js

(had a newer main.js)

talk@26b0befe86
tree@621235bf52
2016-02-04 16:16:18 -08:00
Galen Wolfe-Pauly
d15cf9d5f7 working on hp 2016-02-04 16:00:23 -08:00