Commit Graph
7 Commits
Author SHA1 Message Date
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