 Stephen Cox
|
690e65616d
|
Merge branch 'dev' into 45-update-text-on-home-page
|
2018-11-30 16:01:50 +00:00 |
|
|
Stephen Cox
|
f8e0ce8786
|
45 Updated text on the home page
|
2018-11-30 15:59:59 +00:00 |
|
|
Stephen Cox
|
e1154d2f87
|
Merge branch '24-fix-display-issue-on-technology-pages' of git.coop:cotech/website into 24-fix-display-issue-on-technology-pages
|
2018-11-30 12:17:47 +00:00 |
|
|
Stephen Cox
|
2fc5d7226b
|
#24 Fixed display of coop logos on technology pages
|
2018-11-30 12:17:10 +00:00 |
|
|
Stephen Cox
|
ef6e94d08a
|
Removing merge conflict text
|
2018-11-30 11:47:58 +00:00 |
|
|
Stephen Cox
|
e575823428
|
Merged dev
|
2018-11-30 11:43:15 +00:00 |
|
|
Stephen Cox
|
d72317f436
|
Updated DOT Project logo
|
2018-11-30 11:36:29 +00:00 |
|
|
Stephen Cox
|
6749541cf5
|
#2 Hide coop services, technology and client listings when the coop hasn't included them in maekdown file
|
2018-11-30 11:35:54 +00:00 |
|
|
Stephen Cox
|
34fbb2f4e8
|
#2 Fixed markdown for coop pages
|
2018-11-30 11:34:46 +00:00 |
|