Commit Graph
23 Commits
Author SHA1 Message Date
kawaiipunk 39eef16f9e Merge branch 'services_change' into 'master'
Updated "Services we offer" section inline with #63

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!24
2020-02-28 15:09:25 +00:00
kawaiipunk 04c7d20a56 Merge branch 'footer-text-reup' into 'master'
Tweaked footer text

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!25
2020-02-28 15:09:15 +00:00
georgeowell a2f5a6cbac Tweaked footer text 2020-02-26 18:22:40 +00:00
georgeowell 4aaeac1f07 Additional proof tweaks 2019-09-03 18:42:35 +01:00
georgeowell 7220ee6178 Proofed original text and added some corrections 2019-09-03 18:39:44 +01:00
georgeowell 7d9b81b324 Added note that CONTRIBUTING.md may be out of date 2018-11-21 15:04:35 +00:00
georgeowell a50249fe22 Improved wording of description of CI in README 2018-11-21 15:03:06 +00:00
georgeowell 9443912519 Merge branch 'master' of gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io 2018-11-21 01:42:11 +00:00
georgeowell 9c4166e573 Updated README to reflect our new CI setup 2018-11-21 01:41:43 +00:00
kawaiipunk 39c391e803 Merge branch 'add-cotech-link' into 'master'
Added link to CoTech website to CoTech logo in footer

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!21
2018-11-08 12:45:29 +00:00
georgeowell 33add8fd8f Added link to CoTech website to CoTech logo in footer 2018-11-05 23:48:21 +00:00
kawaiipunk 3c3fe48672 Delete 2018-01-11-spectre-and-meltdown.md 2018-08-10 15:26:18 +00:00
georgeowell f8c9d7bf10 Merge branch 'spectre-blog-post' into 'master'
Spectre blog post

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!20
2018-01-14 22:45:59 +00:00
georgeowell 8ad7fd5fed Spectre blog post 2018-01-14 22:45:58 +00:00
georgeowell d16aec42bd Merge branch 'update-email' into 'master'
Update email

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!18
2017-11-04 12:35:49 +00:00
georgeowell 7331e9af7d Updated email to new shared account 2017-11-04 12:33:11 +00:00
georgeowell 0eec131e97 Merge branch 'finish-beta-content' into 'master'
Finish beta content

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!9
2017-09-27 11:22:38 +00:00
georgeowell fcaf84a990 Merge branch 'finish-beta-content' into 'master'
Finish beta content

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!8
2017-09-27 10:45:56 +00:00
georgeowell 02252e2d0c Merge branch 'inital-content' into 'master'
Added additional text to Services we offer and contact section

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!7
2017-09-24 18:13:49 +00:00
georgeowell ea50f1528a Merge branch 'master' into 'inital-content'
# Conflicts:
#   src/_includes/section-three.html
2017-09-24 18:13:21 +00:00
georgeowell 1f513c53af Merge branch 'basic-content-structure' into 'master'
Add clients and contact page

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!5
2017-09-22 21:03:43 +00:00
georgeowell 8d4be8f87f Merge branch 'basic-content-structure' into 'master'
Inital content structure

See merge request autonomic-cooperative/autonomic-cooperative.gitlab.io!3
2017-09-22 20:57:44 +00:00
georgeowell 6796602fad Merge branch 'add-readme' into 'master'
First stab at a README

Closes #1

See merge request !1
2017-09-07 23:57:09 +00:00