362 Commits

Author	SHA1	Message	Date
trentmc	51484700fd	rename testnets.md -> network-ropsten.md	2020-10-21 12:30:38 +02:00
trentmc	972a5a881a	rewrite get-tokens page for v3	2020-10-21 11:03:03 +02:00
trentmc	b6224a5318	link to the other networks page	2020-10-21 09:43:57 +02:00
trentmc	067c698c15	tweak	2020-10-21 09:35:11 +02:00
Matthias Kretschmann	33aa49f3dc	markdown fixes	2020-10-20 23:05:12 +02:00
trentmc	c799867ee4	update resources for v3. Basically, simplify:)	2020-10-17 09:15:39 +02:00
trentmc	288b5c01a6	update 'Contributions' section	2020-10-17 09:09:20 +02:00
trentmc	ed89a70f74	add architecture image, point to it	2020-10-17 08:16:59 +02:00
trentmc	1ce34b20cb	use a figure. next step: replace this figure	2020-10-17 08:06:51 +02:00
trentmc	9c293236ed	many improvements to content/concepts	2020-10-17 08:05:17 +02:00
trentmc	125eb99ee1	tweak	2020-10-17 07:36:40 +02:00
trentmc	83d7de21cd	rework so that three types of networs: local, test, main. Did not rename webpages themselves	2020-10-16 16:55:53 +02:00
trentmc	b7c3881e7c	more improvements to terminology	2020-10-16 13:02:38 +02:00
trentmc	f776cc2f33	more wip on components	2020-10-16 12:56:27 +02:00
trentmc	d69c2cdfd7	wip update components for v3.	2020-10-16 12:46:59 +02:00
trentmc	430d6b2d60	update terminology for v3. may deprecate more	2020-10-16 12:46:42 +02:00
trentmc	7db9e897b2	now roughyl correct for v3. Could still simplify or even deprecate this page	2020-10-16 12:36:30 +02:00
trentmc	558cf3f17b	fully change the intro, towards super pragmatic actions (based on new ones in main site)	2020-10-16 12:16:38 +02:00
Matthias Kretschmann	e4d81190b9	update OCEAN contract	2020-09-27 20:14:42 +02:00
Matthias Kretschmann	7479b7398e	new contract address	2020-08-21 21:38:02 +02:00
Matthias Kretschmann	f0f4805384	deploy fix	2020-08-21 12:06:44 +02:00
Matthias Kretschmann	44513f024d	remove token bridge	2020-08-21 11:44:43 +02:00
Matthias Kretschmann	99a8735036	prepare token swap	2020-08-21 11:24:19 +02:00
Matthias Kretschmann	6cac75e107	simplify, remove personal deals paragraph	2020-08-17 12:35:47 +02:00
Matthias Kretschmann	59698afee2	ocean tokens updates ... * switch token tool to the one on our token page * refer to token page for official list of exchanges	2020-08-17 12:27:04 +02:00
Manan Patel	68d55e57a2	added missing exchanges ... Added balancer, uniswap, vcc, gate.io	2020-08-07 17:35:31 +05:30
Manan Patel	937afc2493	removed gitter + added port	2020-06-22 16:51:24 +05:30
sjvallon	2d3e0f4336	Update bounties.md ... Removed bounties network references.	2020-06-11 09:47:58 +02:00
Matthias Kretschmann	074321b323	formatting	2020-06-03 02:30:38 +02:00
alexcos20	6408cfdbda	fixes	2020-05-04 11:20:05 +03:00
alexcos20	f2b7529b60	first cut	2020-04-29 13:27:29 +03:00
Matthias Kretschmann	9916124da4	Update testnets.md	2020-01-10 15:19:36 +01:00
Matthias Kretschmann	921595b47c	Merge pull request #332 from oceanprotocol/feature/ipfs ... add IPFS to Tools	2019-12-17 11:32:22 +01:00
Matthias Kretschmann	52fee4e974	add ipfs to tools	2019-12-16 13:36:52 +01:00
Beth McCarthy	663d5c8282	Update ocean-tokens.md	2019-12-03 10:25:40 +01:00
Matthias Kretschmann	7d40ffd51c	Merge pull request #318 from oceanprotocol/feature/ipfs ... add osmosis-ipfs-driver	2019-10-08 13:23:17 +02:00
Matthias Kretschmann	ebf72a1650	switch Pleuston for Commons in most places	2019-10-08 12:56:32 +02:00
Matthias Kretschmann	8085e615fe	add osmosis-ipfs-driver	2019-10-08 12:50:35 +02:00
Matthias Kretschmann	0378d84bef	copy tweaks	2019-09-18 11:33:04 +02:00
Matthias Kretschmann	2daab3a2e6	copy updates	2019-09-18 11:33:04 +02:00
Matthias Kretschmann	87671b1bae	mention Events Handler	2019-09-18 11:33:04 +02:00
Matthias Kretschmann	89c6a9f371	add status repo to tools	2019-09-18 10:55:50 +02:00
Matthias Kretschmann	5dcc2f8260	package updates ... * closes #308	2019-08-20 11:42:35 +02:00
Matthias Kretschmann	f7b6600be8	fix Nile urls	2019-08-19 14:02:52 +02:00
Matthias Kretschmann	41a3850052	update submarine section	2019-07-30 13:12:41 +02:00
Matthias Kretschmann	834addebd7	link to quickstart	2019-07-30 13:06:09 +02:00
Matthias Kretschmann	9dab2f341d	limit options to get ETH in Spree	2019-07-30 12:57:24 +02:00
Matthias Kretschmann	0a76bed738	mention barge in more places	2019-07-30 12:43:04 +02:00
Matthias Kretschmann	a87b10c612	new note style	2019-07-26 14:11:58 +02:00
Matthias Kretschmann	4177e8f00e	mention token bridge in more places	2019-07-10 18:52:01 +02:00
Matthias Kretschmann	9d0810d58b	copy & image updates	2019-07-09 19:00:58 +02:00
Matthias Kretschmann	b7b57c272a	more fixes	2019-07-09 00:41:51 +02:00
Matthias Kretschmann	817a3ba33c	remove Kovan	2019-07-08 18:00:14 +02:00
Matthias Kretschmann	13afb357d9	more Pacific fixes	2019-07-08 17:48:08 +02:00
Matthias Kretschmann	7f0543359a	add Aquarius & Brizo test instances, fetch API specs from it	2019-07-08 16:51:02 +02:00
Jernej Pregelj	bbec2c509b	Merge branch 'master' of https://github.com/oceanprotocol/docs into document-pacific-details	2019-07-02 16:12:47 +02:00
Jernej Pregelj	50cc1b5a43	missing information	2019-07-02 16:12:03 +02:00
Troy McConaghy	26a14e804d	Document some Pacific Network details	2019-06-28 15:38:31 +02:00
Troy McConaghy	da68e3efd3	Update the URLs of some components in Nile	2019-06-28 10:42:36 +02:00
Troy McConaghy	a5346a8984	npm run format	2019-06-24 14:05:54 +02:00
Troy McConaghy	92af1f046b	Update info about Pacific _before_ its launch	2019-06-24 13:41:07 +02:00
Troy McConaghy	47f4b522d2	Put Elasticsearch first. Unmention BigchainDB (DB)	2019-06-19 10:59:37 +02:00
Troy McConaghy	5600315eb0	Use Markdown footnote syntax instead	2019-06-12 14:42:38 +02:00
Troy McConaghy	3fd0ec57d5	npm run format	2019-06-12 13:38:58 +02:00
Troy McConaghy	51eb86a5ea	Change instances of 'the ocean (protocol) network'	2019-06-12 13:36:56 +02:00
Troy McConaghy	6d1a98f70e	"The Production-Ready Ocean Network"	2019-06-11 09:26:34 +02:00
Matthias Kretschmann	760e26e81e	Merge pull request #265 from oceanprotocol/feature/forks ... Label forks	2019-06-07 15:39:34 +02:00
Matthias Kretschmann	db9ef03547	formatting fix	2019-06-07 14:41:53 +02:00
Matthias Kretschmann	3472917318	split up libraries repos list, add Osmosis, add parity fork	2019-06-07 14:35:59 +02:00
daneklustig	6893431932	Update resource with the new event link	2019-06-07 09:54:07 +02:00
Troy McConaghy	c310785b3c	Update the "Tools" page	2019-06-06 14:06:51 +02:00
Matthias Kretschmann	20514021b9	typo	2019-06-04 19:10:10 +02:00
Troy McConaghy	8ccf5e792e	How to check your OCEAN balance, and ... the URLs of the Aquarius & Brizo used by Commons Marketplace.	2019-06-03 15:16:27 +02:00
Troy McConaghy	a870fada07	Reorg Ocean Token docs. Add KuCoin & DutchX.	2019-05-31 12:50:16 +02:00
Troy McConaghy	fc4be076e8	npm run format	2019-05-23 11:32:22 +02:00
Troy McConaghy	55c2eb0343	Remove TODO line	2019-05-23 11:27:20 +02:00
Troy McConaghy	ff3e53997b	Update terminiolgy re/ Ocean Production Network	2019-05-23 11:20:15 +02:00
Troy McConaghy	952e2f0609	Add subsection about the Duero Testnet	2019-05-16 10:22:24 +02:00
daneklustig	600c746022	Update resources.md	2019-05-15 17:30:31 +02:00
Troy McConaghy	12c6e95058	Renamed the Resources section	2019-05-10 17:37:58 +02:00
daneklustig	da25936c1b	Merge pull request #241 from oceanprotocol/daneklustig-patch-3 ... Remove papers from introduction	2019-05-10 17:29:01 +02:00
daneklustig	f7f2b5ec19	Remove papers from introduction	2019-05-10 17:23:43 +02:00
daneklustig	870e03029f	Updated resources page	2019-05-10 17:19:21 +02:00
Troy McConaghy	4bf1277ecf	Add new RESOURCES subsection with an empty page	2019-05-10 16:40:11 +02:00
Troy McConaghy	9ca1c0572e	Merge pull request #234 from oceanprotocol/revise-testnet-page ... Revised the 'Testnets' page	2019-05-09 14:15:11 +02:00
sjvallon	07e33cdd5a	Update tools.md	2019-05-09 13:49:27 +02:00
Troy McConaghy	14179b92d9	Revised the 'Testnets' page	2019-05-09 13:30:18 +02:00
Troy McConaghy	49fe5c3d5f	Updates following the IEO	2019-05-07 15:39:35 +02:00
Luke Schoen	4c0961c723	Fix typo	2019-04-21 08:49:45 +02:00
Matthias Kretschmann	5c74477ff8	omit node option from Spree explanation	2019-04-18 11:12:25 +02:00
Troy McConaghy	7579c9a100	Merge pull request #217 from oceanprotocol/feature/faucet ... Add faucet UI to Get Ether doc	2019-04-17 11:51:56 +02:00
Troy McConaghy	e7e681e602	Fix two incorrect "localhost" URLs	2019-04-17 09:47:59 +02:00
Matthias Kretschmann	6191941dcd	mention faucet server	2019-04-16 20:40:16 +02:00
Troy McConaghy	6c6076e1ad	Delete single instance of the word "tribes" ... That word isn't used anywhere else in the docs so I see no need to use it here.	2019-04-11 10:53:34 +02:00
Troy McConaghy	92c005bd20	Doc Commons Marketplace. Update mktplc setup guide	2019-04-10 15:19:00 +02:00
Troy McConaghy	537d52b560	Add note re/ Ganache-based testnets	2019-04-08 12:05:14 +02:00
Troy McConaghy	2bcf8d6c4b	Add help re/ whether to use Kovan, Nile or Spree	2019-04-08 11:19:16 +02:00
Troy McConaghy	a49200e0d6	Give more help with connecting to Nile Testnet	2019-04-05 15:48:35 +02:00
Troy McConaghy	eff7b896ae	Some edits to Tools page	2019-04-04 13:30:57 +02:00
Troy McConaghy	b938310816	npm run format + manually tweak	2019-04-04 11:56:56 +02:00
Troy McConaghy	1494176392	Split Tools & Examples into separate pages	2019-04-04 11:16:39 +02:00
Troy McConaghy	a4f2e57a22	Add docs: how to request Ocean Tokens in testnets	2019-04-01 16:48:37 +02:00
Troy McConaghy	65cc4a3dd9	Add OceanDB & Osmosis subheadings	2019-03-27 14:47:28 +01:00
Troy McConaghy	dd05ffd118	Add more about the OceanDB & Osmosis drivers	2019-03-27 14:22:32 +01:00
Troy McConaghy	0d6dc2aae8	+ "Develop a Service Integration Driver or Plugin"	2019-03-22 11:16:09 +01:00
Troy McConaghy	6cda490023	Make changes suggested by Patty	2019-03-20 14:32:57 +01:00
Troy McConaghy	88cb3019b4	Add more cautionary language re/ Ocean Tokens	2019-03-18 15:20:17 +01:00
Troy McConaghy	e4fc46dfe7	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-18 15:00:32 +01:00
Troy McConaghy	bbc3ad09c4	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-18 14:23:45 +01:00
Troy McConaghy	6fe71851ef	Merge branch 'master' into two-new-tutorial-pages	2019-03-18 14:19:42 +01:00
Troy McConaghy	e7dc8b41f5	Add 2 new tutorials re/ wallets	2019-03-18 14:14:40 +01:00
Troy McConaghy	8c7f3f2866	Add link to "An Ambassador's Tale" post	2019-03-16 17:14:11 +01:00
Troy McConaghy	b11d2d136b	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-15 15:35:47 +01:00
Troy McConaghy	0003a13a9b	Further simplify & correct "Wallet Basics"	2019-03-15 15:28:44 +01:00
Troy McConaghy	6a37de2d60	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-15 11:58:31 +01:00
Troy McConaghy	a043b84d4e	Link from SEA def'n. to OEP-11	2019-03-15 09:33:30 +01:00
Troy McConaghy	80da5f780a	Merge branch 'master' into initial-docs-about-real-ocean-tokens	2019-03-14 17:11:49 +01:00
Troy McConaghy	864c725073	Add testnet notes on ChainID, local RPC URL, +	2019-03-14 17:02:15 +01:00
Troy McConaghy	84312cbb07	More revisions	2019-03-14 11:42:17 +01:00
Troy McConaghy	9e2bed6dc3	Revisions	2019-03-13 16:12:54 +01:00
Troy McConaghy	569c81b8ee	New page re/ Ocean Tokens + edit related pages	2019-03-13 13:44:30 +01:00
Troy McConaghy	8f4f8bf1ca	Merge branch 'master' into add-testnet-details-to-testnets-page	2019-03-13 09:27:01 +01:00
Troy McConaghy	0ca4a17036	Expand the instructions adding copyright notice	2019-03-13 09:26:44 +01:00
Troy McConaghy	9bd75976a5	Merge branch 'add-testnet-details-to-testnets-page' of github.com:oceanprotocol/docs into add-testnet-details-to-testnets-page	2019-03-13 09:18:58 +01:00
Troy McConaghy	ab2fda742d	OCEAN or SBT-OCN	2019-03-13 09:17:30 +01:00
Troy McConaghy	de9b10c186	Merge branch 'master' into add-testnet-details-to-testnets-page	2019-03-12 16:19:04 +01:00
Troy McConaghy	83ad6a7431	Remove two special/temporary OceanToken addresses	2019-03-12 16:17:17 +01:00
Troy McConaghy	6fa1994400	Simplify the 'Ways to Contribute' page	2019-03-12 15:59:08 +01:00
Troy McConaghy	68d36bc5f6	Update & add details to the "Testnets" page	2019-03-12 15:28:10 +01:00
Troy McConaghy	6e33e97491	Revise the legal reqs for external code contribs.	2019-03-09 15:16:40 +01:00
Troy McConaghy	b721b23de8	Merge branch 'master' into feature/accepting-code-from-external-contributors	2019-03-09 09:29:00 +01:00
Troy McConaghy	79df00c34c	Merge branch 'master' into update-tools-and-examples-page	2019-03-07 09:56:39 +01:00
Troy McConaghy	79ee8a7b84	Remove mention of token bridge in production ... I guess we don't want to commit to there being a token bridge between the Ethereum mainnet and the Ocean mainnet. There are other options and it seems we're reviewing them again.	2019-03-06 11:06:54 +01:00
Troy McConaghy	d2eafa9538	Merge branch 'master' into update-tools-and-examples-page	2019-03-05 11:38:59 +01:00
Troy McConaghy	d05c10d5a2	Add another row to wallet combinations table	2019-03-04 15:13:31 +01:00
Troy McConaghy	188d8e18d9	Repair the list of wallets that works with Ocean	2019-03-04 11:08:18 +01:00
Troy McConaghy	3791ff6cfc	Simplify Wallet Basics + Metamask Tutorial pages	2019-03-02 20:52:33 +01:00
Troy McConaghy	3b29eb310c	Update the Tools & Examples page	2019-03-01 13:30:51 +01:00
Troy McConaghy	fc5709c431	Revise the def'n of Assets & link to it more	2019-02-22 13:24:46 +01:00
Troy McConaghy	97af514a1c	Merge branch 'master' into feature/now-support-many-storage-options	2019-02-22 10:00:30 +01:00
Troy McConaghy	cbb470b28f	Revise + add docs bc now support 3 storage options	2019-02-21 17:00:28 +01:00
Troy McConaghy	0f493c6bdf	Merge branch 'master' into edit-wallet-docs	2019-02-20 17:18:13 +01:00
MarcusJones	ce70d1ac55	Update tools.md	2019-02-20 16:59:15 +01:00
MarcusJones	a03f8c1625	Update tools.md	2019-02-20 16:56:38 +01:00
Troy McConaghy	56f62ebc4d	Document the existence of Plecos (the tool)	2019-02-20 16:50:48 +01:00
Troy McConaghy	288e9410d4	mv wallets to /concepts, make MetaMask tut. stand-alone	2019-02-20 14:21:03 +01:00
Troy McConaghy	ae5d490068	Add note re Spree Testnet on Testnets page	2019-02-13 16:22:19 +01:00
Troy McConaghy	77724b637d	Move mission blog post ref under Mission Statement	2019-02-08 10:01:35 +01:00
Matthias Kretschmann	874fe42527	update papers section	2019-02-07 18:32:05 +01:00
Troy McConaghy	b4ed53c9d7	Fix link for the O.P. bounties on Gitcoin	2019-02-06 16:50:43 +01:00
Troy McConaghy	24e01791d2	Merge branch 'master' into feature/accepting-code-from-external-contributors	2019-01-23 15:47:47 +01:00
Troy McConaghy	a9f49fe7f9	In Terminology page, add link to Wallets page	2019-01-22 12:09:49 +01:00
Troy McConaghy	3b73a3ba96	Add links to more Squid code examples	2019-01-16 16:28:11 +01:00
Matthias Kretschmann	13d7f96944	Merge branch 'master' into feature/accepting-code-from-external-contributors	2019-01-09 20:16:42 +01:00
Matthias Kretschmann	a08aa00d55	add openwaters repo	2019-01-08 11:25:51 +01:00
Troy McConaghy	8932155b06	npm run format	2018-12-24 12:24:35 +01:00
Troy McConaghy	df60cae17b	Revised legal-reqs page. Repo must have DCO copy.	2018-12-24 11:02:43 +01:00
Troy McConaghy	108bbc9141	Added 'Legal Requirements when Contributing Code'	2018-12-21 17:22:33 +01:00
Troy McConaghy	f986aa312f	Add link & explanation of Jupyter notebook tuts	2018-12-18 10:56:43 +01:00
Troy McConaghy	47463c3403	Rename Ocean/Trilobite Testnet to Nile Testnet	2018-12-06 16:17:56 +01:00
Troy McConaghy	5d636626fc	Rename and revise tut. re/ getting ether & tokens	2018-12-04 10:05:50 +01:00
Troy McConaghy	99f8403c31	Add links re/ the Ambassador Program	2018-11-30 13:26:43 +01:00
Troy McConaghy	354674b2bc	Add links to technical details re/ public testnets	2018-11-30 12:02:34 +01:00
Troy McConaghy	57a3db16c1	Define Verifier and SEA	2018-11-30 10:47:59 +01:00
Troy McConaghy	fb1fb5eaa3	Removed only instance of "Tribe" in this repo ... @dgossen said he's not comfortable using "tribe" and I agree. @aaitor When I asked Trent about this, he said we might use "tribe" internally and informally, but it shouldn't be used in official communications.	2018-11-29 09:12:09 +01:00
Troy McConaghy	30fddaa2aa	Got Kovan tutorial in a complete-enough state	2018-11-28 12:25:59 +01:00
Troy McConaghy	11b343f102	Add first draft of use-a-testnet.md	2018-11-27 13:59:37 +01:00
Troy McConaghy	a1ed05d41b	Added overview page about the testnets	2018-11-27 11:22:56 +01:00
Troy McConaghy	7b38db27f8	Fix the terminology as per issue #55	2018-11-22 12:03:32 +01:00
Matthias Kretschmann	7a7bee1897	Merge branch 'master' into feature/architecture_details	2018-11-22 11:23:56 +01:00
Troy McConaghy	534b3b048a	Delete old Squid_role_diagram* images	2018-11-22 10:51:12 +01:00
Troy McConaghy	13a7dd1b01	Improved descriptions of some components	2018-11-22 10:43:15 +01:00
aitor@oceanprotocol.com	ae96d757de	adding diagram with integration of squid in the ecosystem with the rest of Ocean components	2018-11-22 10:31:44 +01:00
Troy McConaghy	ddcb9f6db3	Revised the Tools & Examples page	2018-11-19 16:00:05 +01:00
Troy McConaghy	460f0d9afd	In contributing.md, link to engineering principles ... and also to the page on reporting vulnerabilities	2018-11-18 09:40:02 +01:00
Matthias Kretschmann	d09ca41023	remove question mark	2018-11-16 17:35:41 +01:00
Matthias Kretschmann	9e672b9ccc	add oceandb repos as components	2018-11-16 17:35:40 +01:00
Matthias Kretschmann	1ffa265f45	Merge branch 'master' into feature/tools	2018-11-16 14:36:15 +01:00
Matthias Kretschmann	ef3725e7db	add a tools page	2018-11-16 13:37:06 +01:00
Matthias Kretschmann	cb91917ca3	remove test readme from aquarius	2018-11-16 13:17:47 +01:00
Matthias Kretschmann	9f45667a83	intro update	2018-11-16 13:12:52 +01:00
Matthias Kretschmann	a13a240872	cleanup	2018-11-16 10:33:31 +01:00
Matthias Kretschmann	4b63dad3aa	Merge branch 'master' into feature/github-repo-contents	2018-11-15 23:52:49 +01:00
Matthias Kretschmann	db40e15444	layout fixes	2018-11-15 15:45:07 +01:00
Troy McConaghy	a84b7b7b3a	Revised Keeper page, Publisher page & various others	2018-11-15 14:11:22 +01:00
Matthias Kretschmann	a36e73163c	Merge branch 'master' into feature/github-repo-contents	2018-11-14 16:05:07 +01:00
Troy McConaghy	26b308c1c3	Added a temporary diagram for Squid	2018-11-14 15:07:19 +01:00
Matthias Kretschmann	13639a678f	proof of concept for generating pages from selected repo contents	2018-11-14 13:00:32 +01:00
Matthias Kretschmann	a53c227acc	attach readme contents to all repos	2018-11-13 14:38:23 +01:00
Troy McConaghy	e554342332	Merge branch 'master' into feature/docs-edits-nov-12-13	2018-11-13 14:19:40 +01:00
Troy McConaghy	20680120be	Got Core Concepts in good shape, some edits to markeplaces	2018-11-13 14:14:29 +01:00
Matthias Kretschmann	b2a093d630	repo tweaks	2018-11-12 14:07:04 +01:00
Matthias Kretschmann	fafd1ff424	vs code extension suggestions	2018-11-12 13:00:41 +01:00
Matthias Kretschmann	7d461f75f4	lint & format	2018-11-12 12:52:39 +01:00
Troy McConaghy	86d5cf76a5	All Troy's content revisions made on 11-11-2018	2018-11-11 15:49:38 +01:00
Matthias Kretschmann	1b26599abd	copy updates	2018-11-11 04:02:34 +01:00
Matthias Kretschmann	0cd438fa97	use repository component in markdown	2018-11-11 01:32:05 +01:00
Matthias Kretschmann	b37159a5d6	content restructuring, document content	2018-11-09 21:13:17 +01:00
Matthias Kretschmann	28ad87ded1	auto generate github links for repos, more content updates	2018-11-09 20:23:24 +01:00
Matthias Kretschmann	fe621e527c	content updates, move some stuff from ocean repo	2018-11-09 19:08:36 +01:00