Commit Graph

49 Commits

Author SHA1 Message Date
Richard Ramos e3bcb9fec6
Adding back Status Logo 2018-08-24 14:43:30 -04:00
Richard Ramos efc6e51e99
Merge pull request #1 from ERC725Alliance/master
Updating to latest changes
2018-08-24 14:42:23 -04:00
Josh Fraser 545eee5458 fix conflict 2018-08-24 11:07:13 -07:00
Josh Fraser 0c5439882f Merge branch 'ricburton-patch-1' 2018-08-24 11:05:56 -07:00
Josh Fraser 47b6494586 fix conflict 2018-08-24 11:04:39 -07:00
Josh Fraser 30075ce53f Merge branch 'ricburton-patch-1' 2018-08-24 10:57:42 -07:00
Josh Fraser 13a5f84f34
Merge pull request #7 from Neufund/Adding_Neufund
adding neufund
2018-08-24 10:55:41 -07:00
Coleman Maher d1d7add8a8
updating index
updating the copy and removing status/gnosis until they confirm they want to be on website @joshfraser
2018-08-24 10:29:48 -07:00
mpneu 355b59e35e Adding Neufund
Adding Neufund to the webpage
2018-08-24 17:29:04 +02:00
Richard Burton b9347a8b8c
Adding myself to da club
Ally thyself.
2018-08-24 11:25:21 +04:00
Josh Fraser 32b8731d50
Merge pull request #5 from macalinao/master
Add Abacus to the ERC725 alliance
2018-08-23 19:18:49 -07:00
Ian Macalinao 3500a6326a
Add Abacus to the ERC725 alliance 2018-08-23 19:12:28 -07:00
Josh Fraser 5cc02a0ecb use two column news on small screens 2018-08-23 16:11:34 -07:00
Josh Fraser f4474ca63d
Update CNAME 2018-08-23 16:07:16 -07:00
Josh Fraser 7f1d4c00f1 Update CNAME 2018-08-23 13:53:28 -07:00
Josh Fraser d748b23e84 Update CNAME 2018-08-23 13:53:06 -07:00
Josh Fraser b72490194a add cryptoslate article too 2018-08-23 13:36:58 -07:00
Josh Fraser 279b3a7b29 Merge branch 'master' of https://github.com/ERC725Alliance/erc725alliance.github.io 2018-08-23 11:06:02 -07:00
Josh Fraser cfd0307014 remove Mircea 2018-08-23 11:05:54 -07:00
Josh Fraser e0bbe8b253
Merge pull request #4 from FractalBlockchain/add-fractal-to-projects-list
Adds Fractal to projects list
2018-08-23 02:30:10 -07:00
Júlio Santos c103110f94 Adds Fractal to projects list 2018-08-23 10:27:39 +01:00
Josh Fraser 0d46a19640
Update README.md 2018-08-23 01:05:37 -07:00
Josh Fraser e44e143050
Update CNAME 2018-08-23 01:01:07 -07:00
Josh Fraser 6dbad705f7
Update CNAME 2018-08-23 00:59:29 -07:00
Josh Fraser d7b357be69 add the boxes for a little style & make it work in firefox 2018-08-23 00:42:34 -07:00
Josh Fraser 35f46110c0 formatting 2018-08-23 00:13:47 -07:00
Josh Fraser 8ff6bf4374 initial pass 2018-08-23 00:12:14 -07:00
Josh Fraser 891dc5e693 Set theme jekyll-theme-minimal 2018-08-18 20:19:07 -07:00
Josh Fraser 7ebb4f193c Update CNAME 2018-08-18 20:17:40 -07:00
Josh Fraser 74aa8aa6d8 Update CNAME 2018-08-18 20:17:12 -07:00
Coleman b8260edcb2
delete 2018-08-16 12:57:40 -07:00
Coleman bcfc5bd5c0
delete 2018-08-16 12:57:30 -07:00
Coleman e4a9756fe9
create CNAME 2018-08-16 12:55:43 -07:00
Coleman 7d7a1c5e56
create index.html 2018-08-16 12:55:20 -07:00
Coleman 1c4261e3fa
create CNAME 2018-08-16 12:52:54 -07:00
Coleman 2661d64135 Delete CNAME 2018-08-16 12:51:07 -07:00
Coleman 3ce8e6a854 Create CNAME 2018-08-16 12:45:56 -07:00
Coleman 28eb8acfe7 Delete CNAME 2018-08-16 12:45:38 -07:00
Coleman 99b7ab55d2
change dir for index 2018-08-16 12:40:41 -07:00
Coleman 043efa9252
Delete CNAME 2018-08-16 12:40:18 -07:00
Coleman 8b3e1c0800
Create CNAME 2018-08-16 12:39:58 -07:00
Coleman ab95982306
Update README.md 2018-08-16 12:29:46 -07:00
Coleman b8d71b6ef1
Update README.md 2018-08-16 12:29:17 -07:00
Coleman d46528bb76
Updating README.md 2018-08-16 12:16:13 -07:00
Coleman a93c2473e7
adding apex 2018-08-16 12:02:44 -07:00
Coleman fa437ec939 Update CNAME 2018-08-16 12:00:58 -07:00
Coleman ad1216e470 Create CNAME 2018-08-16 11:58:57 -07:00
Coleman 7880bbdfeb index.html
basic index placeholder
2018-08-16 11:49:05 -07:00
Coleman 2f1afa5e28
Initial commit 2018-08-16 11:42:45 -07:00