Commit Graph

4 Commits

Author SHA1 Message Date
johncburnham
f349b9d674 this is a website 2014-08-07 11:01:17 -07:00
C. Guy Yarvin
9b880d9b7c Merge branch 'master' of github.com:urbit/urbit 2014-08-05 14:01:02 -07:00
C. Guy Yarvin
b44358ac73 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-08-05 12:50:16 -07:00
C. Guy Yarvin
722b6c556b Some renamings. 2014-08-04 20:23:29 -07:00