urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 12:43:31 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,025 Commits 768 Branches 10 Tags 215 MiB
7355b8d998
Commit Graph

1025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ault011
0f62bc24fd Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 16:15:43 -07:00
John Dulin
7f16c87149 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 14:42:11 -07:00
C. Guy Yarvin
a1e3d6316b Merge branch 'master' of github.com:urbit/urbit 2014-08-08 13:10:22 -07:00
ault011
d69573b038 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-08 11:32:19 -07:00
C. Guy Yarvin
bf8bb02638 Merge branch 'master' of github.com:urbit/urbit 2014-08-08 11:23:34 -07:00
C. Guy Yarvin
731e4bfc7f Merge branch 'master' of github.com:urbit/urbit 2014-08-08 11:19:46 -07:00
C. Guy Yarvin
8dcaf14c3f Merge branch 'master' of github.com:urbit/urbit 2014-08-08 10:57:17 -07:00
Anton Dyudin
8322198ee4 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 17:58:30 -07:00
Ubuntu
4a79e0e7a3 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 22:50:16 +00:00
johncburnham
84b0068932 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 15:37:56 -07:00
ault011
3e74018060 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 15:10:22 -07:00
ault011
f3c6e4c34e Merge branch 'master' of https://github.com/urbit/urbit 2014-08-07 14:43:56 -07:00
C. Guy Yarvin
b0ad9ab35d Merge branch 'master' of github.com:urbit/urbit 2014-08-07 14:38:03 -07:00
C. Guy Yarvin
7576d5b5a5 Merge branch 'master' of github.com:urbit/urbit 2014-08-07 14:23:06 -07:00
C. Guy Yarvin
543cbb44f3 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-07 14:22:28 -07:00
C. Guy Yarvin
5d37c42f35 Properly serve pngs. 2014-08-07 12:40:28 -07:00
Anton Dyudin
1cc9b632a9 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-06 16:21:58 -07:00
C. Guy Yarvin
d47f3ed813 A bigger bandaid. 2014-08-06 14:03:33 -07:00
C. Guy Yarvin
87be8b64b4 Install another bandaid. 2014-08-06 13:15:20 -07:00
Ubuntu
d8e4464950 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-06 17:36:00 +00:00
johncburnham
9c027f2c7b Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 19:17:58 -07:00
Ubuntu
c0e41c19e9 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-06 00:54:39 +00:00
C. Guy Yarvin
58e4537069 Merge branch 'master' of github.com:urbit/urbit 2014-08-05 17:19:28 -07:00
John Dulin
de782e3980 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 16:50:08 -07:00
C. Guy Yarvin
518927c817 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 15:33:52 -07:00
ault011
1e51f2b554 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:04:56 -07:00
johncburnham
6c0a7c94d7 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:03:16 -07:00
ault011
9845404373 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:02:49 -07:00
C. Guy Yarvin
604d3f1c13 Merge branch 'master' of github.com:urbit/urbit 2014-08-05 14:01:02 -07:00
ault011
a204d1dfa0 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:00:58 -07:00
C. Guy Yarvin
315b571959 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 12:50:16 -07:00
John Dulin
55f0661277 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 12:15:15 -07:00
Anton Dyudin
f1a89d4075 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 11:49:52 -07:00
Jared Hance
f3d6637fda Only compare head hash 2014-08-05 10:47:58 -04:00
Jared Hance
2e2ce87449 Fix hashes in ++azel 2014-08-05 10:10:15 -04:00
C. Guy Yarvin
e7b54fe942 Moar printf. 2014-08-04 18:39:07 -07:00
C. Guy Yarvin
37aec7440a Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-04 18:20:00 -07:00
C. Guy Yarvin
929328628a Ames protocol to 3. 2014-08-04 18:19:15 -07:00
Anton Dyudin
896c5903a3 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 17:59:13 -07:00
C. Guy Yarvin
d341ec529f Ignore hashes while comparing file updates. 2014-08-04 17:38:38 -07:00
Ubuntu
10ea0cbe87 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 21:52:40 +00:00
Anton Dyudin
e23fdd54c6 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 14:05:53 -07:00
Galen Wolfe-Pauly
1b8eb395d5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 13:22:08 -07:00
Galen Wolfe-Pauly
84c793149a Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:50:37 -07:00
Galen Wolfe-Pauly
0d92e753d5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:38:02 -07:00
ault011
9b6b5d5c1e Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:05:40 -07:00
Galen Wolfe-Pauly
f9fa38180a Merge branch 'urbjs' 2014-08-03 12:04:55 -07:00
Galen Wolfe-Pauly
18b3b48c07 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-03 12:04:19 -07:00
C. Guy Yarvin
a4445a1a93 Merge branch 'master' of github.com:urbit/urbit 2014-08-02 16:40:49 -07:00
pcmonk
6222f8fd1f Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:53:42 -07:00