Commit Graph

124 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
6ac76f9f73 octo frontend 2015-05-12 15:21:10 -07:00
Henry Ault
16d4b63594 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-05-10 16:44:53 -07:00
Galen Wolfe-Pauly
369dd1878a tree for editing 2015-05-08 16:47:46 -07:00
Galen Wolfe-Pauly
4f1a7b537b fix audience 2015-05-08 15:56:33 -07:00
Galen Wolfe-Pauly
5a0d576bd3 not staging; 2015-05-08 15:15:17 -07:00
Galen Wolfe-Pauly
cf6bc4d3fc talk updates 2015-05-08 13:29:24 -07:00
Henry Ault
4c117a9418 merge test 2015-05-07 14:34:49 -07:00
Galen Wolfe-Pauly
d7a2dd9905 off by one 2015-05-07 12:16:48 -07:00
Galen Wolfe-Pauly
b4f0dc6143 audience 2015-05-07 11:47:25 -07:00
Galen Wolfe-Pauly
408b2f0cef colors 2015-05-07 10:49:56 -07:00
Anton Dyudin
b65fc83aa6 Merge branch 'test' 2015-05-07 10:31:10 -07:00
Anton Dyudin
b72da57ce8 Merge branch 'space-tools' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/time.hoon
2015-05-07 10:30:32 -07:00
Henry Ault
478d210298 ported to real network 2015-05-07 02:49:30 -04:00
C. Guy Yarvin
54165e49b8 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2015-05-06 19:13:15 -07:00
Kingdon
f1533c8972 necessary 2015-05-06 21:53:05 -04:00
Galen Wolfe-Pauly
70cb0566d8 minor 2015-05-06 18:24:43 -07:00
Galen Wolfe-Pauly
b3e4633e1f new look 2015-05-06 18:01:36 -07:00
Henry Ault
b543549d28 moved main to base 2015-05-06 14:08:27 -07:00
Galen Wolfe-Pauly
5b7e4120b0 minor doc css 2015-05-04 18:05:13 -07:00
Galen Wolfe-Pauly
46264b255d minor talk fixes 2015-05-01 18:16:32 -07:00
Galen Wolfe-Pauly
276b8fc416 minor talk fixes 2015-05-01 18:06:28 -07:00
Florian Steinel
c9b832d811 fix link to the guides 2015-05-01 15:18:01 +02:00
Anton Dyudin
7ebfeda9a5 fixed main/ imports to base/ 2015-04-30 12:37:46 -07:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00