Merge branch 'small-text-tweeks' of gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io into small-text-tweeks

.drone.yml

@@ -1,27 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm.autonomic.zone
-steps:
-  - name: bundle static
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: docker_reg_username
-      password:
-        from_secret: docker_reg_passwd
-      repo: decentral1se/autonomic.zone
-      tags: latest
-
-  - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
-    settings:
-      stack: jekyll
-      compose: docker-compose.prod.yml
-      deploy_key:
-        from_secret: drone_ssh_swarm.autonomic.zone
-trigger:
-  branch:
-    - master
-event:
-  exclude:
-    - pull_request

.envrc.sample

@@ -1,2 +0,0 @@
-# The path to our pass credentials store
-export PASSWORD_STORE_DIR=$(pwd)/../infrastructure/credentials/password-store

.gitignore

@@ -3,4 +3,5 @@ dist/
 .jekyll-metadata
 .jekyll-cache
 .DS_Store
+Gemfile.lock
 *.gem

.gitlab-ci.yml

@@ -0,0 +1,19 @@
+stages:
+  - deploy
+
+variables:
+  GIT_DEPTH: 1
+
+
+pages:
+  image: jekyll/jekyll:4
+  stage: deploy
+  script:
+    - jekyll build -d public
+    - apk add gzip --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
+    - gzip -v -k -6 $(find public -name '*.js' -o -name '*.html' -o -name '*.css')
+  artifacts:
+    paths:
+      - public
+  only:
+    - master

CHANGELOG.md

@@ -3,17 +3,12 @@
 All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog] and this project adheres to [Semantic Versioning].
 
-[keep a changelog]: http://keepachangelog.com/en/1.0.0/
+[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
-[semantic versioning]: http://semver.org/spec/v2.0.0.html
+[Semantic Versioning]: http://semver.org/spec/v2.0.0.html
-
-## [2.0.0] - 2020-03-30
-
-- Moved website deployment to [git.autonomic.zone](https://git.autonomic.zone).
 
 ## [1.0.2] - 2017-11-05
 
 ## Added
-
 - [#18]: Add shared account email.
 
 [#18]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/18
@@ -21,11 +16,9 @@ is based on [Keep a Changelog] and this project adheres to [Semantic Versioning]
 ## [1.0.1] - 2017-10-14
 
 ## Added
-
 - [#17]: Added automated Gitlab CI production builds.
 
 [#17]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/merge_requests/17
 
 ## [1.0.0] - 2017-10-04
-
 - Initial Release

CONTRIBUTING.md

@@ -1,53 +1,65 @@
 # Contributing
 
-## What Is Jekyll
+### Not that these instructions may be out of date. If you find any quirks that aren't described in this file, please make patches.
+
+# What Is Jekyll
 
 For those unfamiliar with how Jekyll works, check out [jekyll.rb] for all the
 details, or read up on the basics of [front matter], [writing posts] and
-[creating pages]. Alternatively, just dive in and start editing! After all, the
+[creating pages].
-majority of this site is configuration is just flat text, so it's easy to work
-with.
 
 [jekyll.rb]: https://jekyllrb.com/
 [front matter]: https://jekyllrb.com/docs/frontmatter/
 [writing posts]: https://jekyllrb.com/docs/posts/
 [creating pages]: https://jekyllrb.com/docs/pages/
 
-## Development
+# Using RVM to Manage Ruby
 
-The prerequisites are [Docker](https://www.docker.com/) and [Docker-compose](https://docs.docker.com/compose/).
+In order to not blow up your computer handling a system wide Ruby installation, it is
+advised that you use [RVM](https://rvm.io/rvm/install).
 
-If you're on Debian, installing is easy.
+Once you've got that installed and configured, get the latest version of Ruby with:
-
-Install Docker.
 
 ```bash
-$ curl -fsSL https://get.docker.com -o get-docker.sh  # have a look if you want
+$ rvm install 2.6.5
-$ CHANNEL=stable sh get-docker.sh
 ```
 
-Install Docker-compose.
+Select that version and then create an isolated [gemset](https://rvm.io/gemsets/basics) with:
 
 ```bash
-$ cd autonomic.zone
+$ rvm use 2.6.5
-$ python3 -m venv .venv
+$ rvm gemset create autonomic
-$ pip3 install -r requirements.txt
+$ rvm gemset use autonomic
 ```
 
-Then fire up the container with the following.
+# Install Dependencies
+
+Then you can install your Ruby dependencies with:
 
 ``` bash
-$ docker-compose up
+$ gem install jekyll bundler
+$ bundle install
 ```
 
-Then visit the locally running website.
+# Serve Website
 
-> http://localhost:4000
+And serve the website locally with:
-
-Then you can edit the files as normal and reload the page.
-
-To stop the container when you're done, you can run:
 
 ``` bash
-$ docker-compose stop
+$ make devserver
 ```
+
+# Editing Content
+
+Edit content in the `.md` files under `src` and `src/_posts`.
+
+# Next time
+
+When you're hacking later on (or in a new shell), you'll need to run:
+
+``` bash
+$ rvm use 2.6.5
+$ rvm gemset use autonomic
+```
+
+And then you'll have access to the environment.

Dockerfile

@@ -1,17 +0,0 @@
-FROM ruby:2.7.1-alpine
-
-EXPOSE 4000
-
-RUN apk --no-cache add \
-  bash \
-  curl \
-  g++ \
-  git \
-  make
-
-RUN gem install bundler -v 2.1.4
-RUN gem install jekyll -v 4.0.0
-
-COPY . ${WORKDIR}
-
-RUN bundle install

Gemfile

@@ -1,7 +1,3 @@
 source "https://rubygems.org"
-
+ruby '2.6.5'
-ruby "2.7.1"
-
 gemspec
-
-gem "jekyll-feed"

Gemfile.lock

@@ -1,80 +0,0 @@
-PATH
-  remote: .
-  specs:
-    autonomic (0.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.7)
-    ffi (1.12.2)
-    forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    jekyll (4.0.0)
-      addressable (~> 2.4)
-      colorator (~> 1.0)
-      em-websocket (~> 0.5)
-      i18n (>= 0.9.5, < 2)
-      jekyll-sass-converter (~> 2.0)
-      jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
-      kramdown-parser-gfm (~> 1.0)
-      liquid (~> 4.0)
-      mercenary (~> 0.3.3)
-      pathutil (~> 0.9)
-      rouge (~> 3.0)
-      safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-feed (0.13.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
-    jekyll-watch (2.2.1)
-      listen (~> 3.0)
-    kramdown (2.2.1)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    pathutil (0.16.2)
-      forwardable-extended (~> 2.6)
-    public_suffix (4.0.4)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rexml (3.2.3)
-    rouge (3.18.0)
-    safe_yaml (1.0.5)
-    sassc (2.3.0)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  autonomic!
-  bundler (>= 2.1.4)
-  jekyll (>= 4)
-  jekyll-feed
-
-RUBY VERSION
-   ruby 2.7.1p83
-
-BUNDLED WITH
-   2.1.4

Makefile

@@ -0,0 +1,6 @@
+DEV_DIST_DIR:=dist
+
+devserver:
+	@echo "Serving development site from $(DEV_DIST_DIR)"
+	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
+.PHONY: devserver

README.md

@@ -1,14 +1,29 @@
+[![pipeline status](https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/badges/master/pipeline.svg)](https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/commits/master)
+
 # autonomic.zone
 
-[![Build Status](https://drone.autonomic.zone/api/badges/autonomic-cooperative/autonomic.zone/status.svg)](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone)
-
-> https://autonomic.zone
-
 A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template.
 
-[jekyll]: https://jekyllrb.com/
+master is served up to [autonomic.zone] and [autonomic-cooperative.gitlab.io].
+
+[Jekyll]: https://jekyllrb.com/
 [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme
+[autonomic.zone]: https://autonomic.zone/
+[autonomic-cooperative.gitlab.io]: http://autonomic-cooperative.gitlab.io/
+
+# Make a change
+
+Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [pages] CI stage will push any changes on master branch to [autonomic.zone].
+
+[deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17
+
+Watch the [CI/CD pipeline] to see that it builds successfully.
+
+[CI/CD pipeline]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/pipelines
+
 
 # Contribute
 
-Please see [CONTRIBUTING.md](./CONTRIBUTING.md) for the juicy details.
+Please see [CONTRIBUTING.md] for the juicy details. It may need to be updated, so please submit patches if you discover some quirk!
+
+[CONTRIBUTING.md]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/master/CONTRIBUTING.md

_config.yml

@@ -1,18 +1,17 @@
----
 title: Autonomic Co-operative
 email: helo@autonomic.zone
 description: Sustainability, Transparency, Privacy
 baseurl: ""
-url: "https://autonomic.zone"
+url: ""
 source: src
 destination: dist
 sass:
     sass_dir: ./assets/styles
 featured-image-source:
-include: ["src/.well-known", "src/.nojekyll"]
+500px_url:
+github_url:
 mastodon_url: https://sunbeam.city/@autonomic
 twitter_url: https://twitter.com/autonomiccoop
-gitea_url: https://git.autonomic.zone/autonomic-cooperative/
 markdown: kramdown
 permalink: pretty
 collections:
@@ -25,5 +24,3 @@ exclude:
   - vendor
   - Gemfile
   - Gemfile.lock
-plugins:
-  - jekyll-feed

autonomic.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |spec|
   spec.name        = "autonomic"
-  spec.version     = "0.0.0"
+  spec.version     = '0.0.0'
-  spec.date        = "2017-09-24"
+  spec.date        = '2017-09-24'
   spec.summary     = ""
   spec.description = ""
-  spec.authors     = ["autonomic co-operative"]
+  spec.authors     = ['autonomic co-operative']
-  spec.email       = "autonomic.posteo.net"
+  spec.email       = 'autonomic.posteo.net'
-  spec.files       = "README.md"
+  spec.files       = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
 
   spec.add_development_dependency "jekyll", ">= 4"
-  spec.add_development_dependency "bundler", ">= 2.1.4"
+  spec.add_development_dependency "bundler", ">= 1.12"
 end

docker-compose.prod.yml

@@ -1,31 +0,0 @@
----
-version: "3.8"
-
-services:
-  jekyll:
-    image: decentral1se/autonomic.zone:latest
-    command: bundle exec jekyll serve --host 0.0.0.0 --trace
-    environment:
-      JEKYLL_ENV: production
-    networks:
-      - proxy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:4000"]
-      interval: 15s
-      timeout: 10s
-      retries: 10
-      start_period: 20s
-    deploy:
-      update_config:
-        failure_action: rollback
-        order: start-first
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.jekyll.loadbalancer.server.port=4000"
-        - "traefik.http.routers.jekyll.rule=Host(`autonomic.zone`)"
-        - "traefik.http.routers.jekyll.entrypoints=web-secure"
-        - "traefik.http.routers.jekyll.tls.certresolver=production"
-
-networks:
-  proxy:
-    external: true

docker-compose.yml

@@ -1,11 +0,0 @@
----
-version: "3.7"
-
-services:
-  jekyll:
-    image: "jekyll/jekyll:4"
-    command: jekyll serve --watch --force_polling --trace
-    volumes:
-      - ".:/srv/jekyll"
-    ports:
-      - "4000:4000"

renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}

requirements.txt

@@ -1 +0,0 @@
-docker-compose==1.27.4

src/.well-known/autonomic.zone/matrix/server

@@ -1,3 +0,0 @@
-{ 
-"m.server": "matrix.autonomic.zone:443" 
-}

src/_includes/footer.html

@@ -4,44 +4,36 @@
     <div class="column">
       <a class="named-anchor" name="contact"></a>
         <h3>Get in Touch</h3>
-        Contact us to discuss your project's needs and arrange a consultation:</br>
+        Contact us to discuss your project's needs and arrange a consultation:
-        <b><a href="mailto:helo@autonomic.zone">helo@autonomic.zone</a></b></br></br>
+        <a href="mailto:helo@autonomic.zone">helo@autonomic.zone</a></br></br>
-        <b><a href="{{ '/assets/pgp/autonomic-key.asc' | relative_url }}">Download PGP key</a></b></br>
+        <a href="{{ '/assets/pgp/autonomic-key.asc' | relative_url }}">PGP key:</a>
-        <a href= "https://git.autonomic.zone/autonomic-cooperative/autonomic.zone/src/branch/master/src/assets/pgp"> Verify fingerprint:</a><code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>
+        <code id="fingerprint">82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147</code>
 
       <ul class="icons" style="margin-bottom: 0; padding-top: 1em">
         <li>
-          <a title="RSS Feed" rel="me" href="{{ '/feed.xml' | absolute_url }}" style="border-bottom: none">
+          <a rel="noopener" href="{{ site.twitter_url }}" style="border-bottom: none">
-            <!-- This SVG needs to be changed if you change the colour scheme as it is a massive hack. -->
-            <img alt="rss" style="height: 2rem;color: #fff" src="{{ '/assets/svg/rss-square-solid.svg' | absolute_url }}">
-          </a>
-        </li>
-        <li>
-          <a title="Twitter" rel="noopener" href="{{ site.twitter_url }}" style="border-bottom: none">
             <img alt="twitter" style="height: 2rem;" src="{{ '/assets/svg/twitter-brands.svg' | absolute_url }}">
           </a>
         </li>
         <li>
-          <a title="Mastodon" rel="me" href="{{ site.mastodon_url }}" style="border-bottom: none">
+          <a rel="me" href="{{ site.mastodon_url }}" style="border-bottom: none">
             <img alt="mastodon" style="height: 2rem;" src="{{ '/assets/svg/mastodon-brands.svg' | absolute_url }}">
           </a>
         </li>
-        <li>
-          <a title="Gitea" rel="me" href="{{ site.gitea_url }}" style="border-bottom: none">
-            <!-- This SVG needs to be changed if you change the colour scheme as it is a massive hack. -->
-            <img alt="gitea" style="height: 2.3rem;" src="{{ '/assets/svg/Gitea_Logo.svg' | absolute_url }}">
-          </a>
-        </li>
       </ul>
 
     </div>
     <div class="column">
       <div class="copyright">
+        <object style="height: 1.2rem; vertical-align: text-bottom;" type="image/svg+xml" data="{{ '/assets/svg/creative-commons-brands.svg' | absolute_url }}">
+          Your browser does not support SVG
+        </object>&nbsp;
+        {{ site.title }}
       </div>
       <div class="cotech-box">
         <a href="https://www.coops.tech/">
           <img class="cotech-logo" src="{{ '/assets/images/CoTech-white-logo.png' | relative_url }}" alt="CoTech"/>
-          <b><span class="cotech-text">Member of the Cotech Network</span></b>
+          <span class="cotech-text">Member of the Cotech Network</span>
         </a>
       </div>
       <div style="vertical-align: bottom;">
@@ -51,13 +43,7 @@
           Birmingham</br>
           B30 2JH</br>
           United Kingdom</br>
-        </address></br>
+        </address>
-          We are a Co-operative Society registered with the <a href="https://mutuals.fca.org.uk/Search/Society/30380">FCA</a>. 
-          <b>Registration Number: 4597 </b>
-          </br></br>
-      </div>
-     <div style="vertical-align: bottom;">
-     <a href="{{ '/privacy' | relative_url }}">Privacy Policy</a> - <a href="{{ '/terms' | relative_url }}">Terms of Service</a> - <a href="{{ '/gdpr' | relative_url }}">GDPR</a>
       </div>
     </div>
   </div>

src/_includes/services.html

@@ -2,11 +2,11 @@
 <section id="three" class="wrapper style6 special">
   <div class="inner">
     <header class="major">
-      <h2>Cooperative Cloud Infrastructure</h2>
+      <h2>Cooperative Cloud: For Organisations</h2>
       <p>
-        This isn't an exhaustive list. If you don't see what you need, please contact us anyway for a consultation:
+        This isn't an exhaustive list. If you don't see what you need, please contact us anyway:</br>
-      </p>
         <h3><a href="mailto:helo@autonomic.zone">helo@autonomic.zone</a></h3>
+      </p>
     </header>
     <ul class="features">
       <li class="features-item">

src/_posts/2020-04-02-autonomic-pandemic.md

@@ -1,24 +0,0 @@
----
-layout: post
-title: Autonomic in times of pandemic
-description: Life under lockdown
-image: 2020-04-02_autonomic_garden.jpg
-category: updates
-date: 2020-04-02
----
-
-
-# Autonomic in times of pandemic
-
-Just though we'd let everyone know that we are all doing ok during these extraordinary times. Autonomic already carries out all our work remotely so we don't have to change the way we work at all. Business as normal for us in the work realm but we know this isn't the case for many. 
-
-Most of us are involved in local mutual aid projects and we really recommend for everyone is able to get involved in their area (UK lists [here](https://covidmutualaid.org/local-groups/) and [here](https://freedomnews.org.uk/covid-19-uk-mutual-aid-groups-a-list/)). We need to stick together now more than ever. This is especially important for all those with tech skills. We have to help our communities. Tech help will be so appreciated by your local communities and help others to support those in need.
-
-We are also concerned at the rising use of potentially authoritarian surveillance technologies. It is inevitable that under current conditions we would see these technologies deployed in a civil rather than military context. A moment of crisis is the perfect opportunity for those that seek to erode our civil liberties. As hackers, it is our responsibility to fight against repressive technologies wherever we find them for the sake of those less technical than ourselves. 
-
-If you are an organisation or collective that needs help with tech infrastructure, please reach out and we will help to the best of our abilities. This is a time for building cooperation, mutual aid and democratic structures, not only for the duration of the current crisis but also for struggles to come. There is no time to waste.
-
-Love and solidarity
-
-*Autonomic Co-operative*
-

src/_posts/2020-04-23-dat-py.md

@@ -1,52 +0,0 @@
----
-layout: post
-title: Hyperpy, the punk-to-punk protocol in Python
-description: A new Python implementation of the Hypercore protocol is cooking at Autonomic
-image: 2020-04-23-dat-protocol.png
-category: technology, peer-to-peer, hypercore-protocol
-date: 2020-04-23
----
-
-# Hyperpy, the punk-to-punk protocol in Python
-
-We're quite excited by the new wave of community-developed peer-to-peer
-technology. [Scuttlebutt], [Cabal], [Mapeo] and [Beaker browser] are inspiring
-examples of software which show that technology can be built to operate without
-running on centralised commercially-owned infrastructure (e.g. WhatsApp).
-
-One of the underlying innovations for these technologies is the [Hypercore
-protocol], which is a way of describing how two computers can send information
-to each other directly.
-
-Today, the reference implementation of the Hypercore protocol is written in
-Javascript. The Javascript ecosystem has proved to be remarkably flexible for
-advancing this next generation of tools. Simple methods of publishing (npm
-publish), well-established distribution channels (the browser) and a
-[philosophy of modularity] have enabled so many to get started with building
-peer-to-peer technology.
-
-However, there is a great need for other languages and ecosystems to benefit
-from the tools and concepts that are being developed based on the reference
-implementation. People from all walks of life need a working implementation in
-their preferred language of choice. In response to this, we are seeing projects
-like [Datrs] and [Datcxx] emerge (please note, the Hypercore protocol was once
-called the Dat protocol, see [this blog post] for more information).
-
-Alongside these efforts, a member of Autonomic has begun to work on Hyperpy, a
-Python-based implementation of the Hypercore protocol. The project proposes a
-roadmap but offers no deadlines and receives no funding at current status.
-
-However slowly, things are moving along. Further progress updates will be
-posted on this blog as they come in. All development is taking place on
-[git.autonomic.zone/hyperpy].
-
-[scuttlebutt]: https://scuttlebutt.nz/
-[cabal]: https://cabal.chat/
-[mapeo]: https://www.digital-democracy.org/mapeo/
-[beaker browser]: https://beakerbrowser.com/
-[hypercore protocol]: https://hypercore-protocol.org/
-[philosophy of modularity]: https://mafinto.sh/blog/pragmatic-modularity.html
-[datrs]: https://github.com/datrs/
-[datcxx]: https://datcxx.github.io/
-[git.autonomic.zone/hyperpy]: https://git.autonomic.zone/hyperpy/
-[this blog post]: https://blog.datproject.org/2020/05/15/dat-protocol-renamed-hypercore-protocol/

src/assets/js/main.js

@@ -85,7 +85,7 @@
             }
           },
           color: {
-            value: "#f99081"
+            value: "#ff5555"
           },
           shape: {
             type: "circle",
@@ -125,7 +125,7 @@
           line_linked: {
             enable: true,
             distance: 250,
-            color: "#f99081",
+            color: "#ff5555",
             opacity: 0.8,
             width: 2
           },

src/assets/pgp/autonomic-key.asc

@@ -12,19 +12,19 @@ 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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-+MhCJJDlayS1trcVb49OoafyHLMcw9LEZ18wMDqvceqqKYq7bK0xIRON7pCvkddb
+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
-FVwfxSM88+JmKxGT6BNoRx9Xmu+M9KhtVylr0zS0DVlXXf7KlAqPoyjsgnfWG29i
++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
-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
+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
-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
+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
-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
+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
@@ -37,158 +37,157 @@ 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
-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
+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
-AD4WIQSC/IfFGnGQL9wQLPVPkNVbsksRRwUCWf3BugIbIwUJAi0RlAULCQgHAgYV
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-CYLoLQpSyJcBeScPgSMU0ACQrt0hX3ADsqZv0PNdKiWaFoTpKOW3cPqCH7rYQRqq
+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
-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
+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
-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
+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
-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
+PsTFPmuvgsz2Hq6tSzqOdr166kKb957FExC/Z7U9ExtToPOVDW5wLFC81VHg8F6I
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
++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
-+/wOaH47rcg8hNRJUtoBhz8qtU/5whlGMmV+Mi585eHlUXKHtsTtLfjzxBjxDvnD
+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
-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
+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
-+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
+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
-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
+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
-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
+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
-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
+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
-YyiOCeG7b5aln4+Sn4JYJ8usIlCrPTm0uDcHrnISVn7LeIvbMn3t1KqhF4BTkJyH
+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
-VUn3+oNSTQVUhtd4lXO3UcZc4zddYkbLeF2QeY+6yVMFyiB7izRTiQJXBBMBCABB
+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
-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
+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
-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
+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
-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
+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
-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
+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
-BeqesA/l6DVKib/8aIMFo/DHJzYOefeJLCHxX5CYsaADkExMze9tvvdJ1YLjev4d
+8spPyF4VVcreqJilBFrGpDEkL10B3K/WfpS/k5p87IH6JudNNIM0lUyAG1KR5q8l
-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
+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
-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
+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
-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
+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
-+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
+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
-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
+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
-cuyVA3RpuxnMPkWX0ktuPH7Jj7QivAGOkhYGCkI74rHEUqa84rO38DsxPqS4MJga
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+0qtYXdCilkSYbnQthUiHiGaE0c3BMFBUX7yQdTIewmRc6CGkyWNNcyNC0y7HA/B7
-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
+HiGZHlymxDTdrB39AoLv6Bg76pkNIWcUGKkNKHETZSnB/MV2fPg7eQNvLD3qhdNl
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-+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
+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
-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
+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
-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
+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
-+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
+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
-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
+6Tlin1waaqs/D/45TzZcqmiJMEmzvxiN6MZU2NiUEioLSzSlXk8mqw6xmpSjR7r1
-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
+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
-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
++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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+mpxa2w7EsHifxOGcVOTIKb3ctqqHfLlkzBLIlZSThIBG0Yr+6/xjOTDO6+eXvvCW
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+TDm562y+sJGSd4b+yWa5sOdr4u4HusTmZlNbPm2s+YM2GCN4fv1JmQJ0UCuJs/Hc
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-wH53gblOWNSuPiyVBtESz2qciEYEExECAAYFAlqMTxwACgkQtVJ1+8voODzpjACe
+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
-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
+0+4KUOry1BIVmY7Pe+xk8D2IP3lTKACD9T0N+VpFageLvDEWQTUQkMJjiQJUBBMB
 CAA+AhsjBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAFiEEgvyHxRpxkC/cECz1T5DV
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+ZR7MykHEJ8Ly0VyxudAnZk4mpUj/bM8HdTM/OYNdwhMb5TkJFGet4q5lwa0mK9kE
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+Yml28jTrirtYKrFmbY16iZLj7S6elPUctnCTu3rmVHhZfEQg8okxVOr4Y0n9d81K
-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
+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
-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
+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
-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
+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
-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
+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
-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
+ZTHlNRn6jNe+qZ+oT1gRAkUbKTI2M3J2DjV1y3o0JhtwJezC6fC0LUF1dG9ub21p
-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
+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
-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
+BIL8h8UacZAv3BAs9U+Q1VuySxFHBQJc6dhRAhsjBQkLVts1BQsJCAcCBhUKCQgL
-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
+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
-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
+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
-+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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-GwwWIQSC/IfFGnGQL9wQLPVPkNVbsksRRwUCW6K9PQUJC1bbOQAKCRBPkNVbsksR
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-N/3h6bkLlpFwNgDjiZ9FsajIfNaF33Yvhd5oNDcPxgNphhsqh4DiZ24ZV1M3vb+P
+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
-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
+9hKfhK5NH6DQvi1dxTuWG+JupULUVkuQ6bZ/yjsm1olkfp90NVbjh5UHjVhpgJ28
-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
+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
-VYDnYpGlbcrORM0FzY0b4qNhlVhQ+gITJ8zSKfX2KynIZziOG4TboGB5cR6QF7nG
+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
-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
+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
-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
+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
-=jgXl
+28MxhOJMekpPa0tNTCxY6eQlWswQn3ETZd25JPCFAITzJbQfUbpRl24wvsbbhh5A
+tcKKZ1kCRQARAQABiQI8BBgBCAAmAhsMFiEEgvyHxRpxkC/cECz1T5DVW7JLEUcF
+Aln9wZgFCQItEZQACgkQT5DVW7JLEUfqWw//Z86vEQ66bPsv/yh+iIr07FxhrsXZ
+zuRBpdqURFOGDfcz6mfs0KrHvln4vgTqrIOJt2W5tJfZKH5XjLT0q21ZkJhUsjvy
+WS9SSvQocsecYsvJdR5EemqyDwJOkj+0SWt2D/uBFwy6ZPwecFh6UW5WvClrRjb1
+BFKOrpqBp7HtarxH3qWBzvBFtNI0QvI6QxKOqzBlE58Ihr2e/ewC74CysfOefC6E
+//UfNB76VcawU/gE76Xusxx+Bd/XebGLK1AaC4xpBPgQpDWpQTjJcoInadFHxJgq
+ixTqmh83yQFAPomNdorLi7yMbWMjohl+cVcXemHXoaSMREg2FaJ/Z5mjJ5GbvOhd
+ScYG6emEhnFqoS2zTUMA79ajn8IZQ47LtRSvnDuZliCEdjCPWfAeimTR27X3v4Ts
+g8soHDUh5ctD/vNDbgRFeVMH9nV5RPHxJKaxVrNNX2u7Nt68Unw1Qs+6e1zCHUjj
+kjzXbDfU4aE1/yiO/WaeoIhS9jzZe4ADRrQZk3qLCM/HhUPsD4LZTdOLRP8XYN+x
+70+7LO1fkD+QytMnpy3szmSCDyuqjkh2KB7JrqH/pEOrSZYVKiusQoKR4WVrsisW
+2k1roTsSMiHDvLQ6tUG0lXG4dgkbNoP3Bwz9aR8hk6R1Vd3vpJPFvqk3EtpGKkaJ
+KDrIwzOXOcXBllWJAjwEGAEIACYCGwwWIQSC/IfFGnGQL9wQLPVPkNVbsksRRwUC
+W6K9PQUJC1bbOQAKCRBPkNVbsksRR+IsEACAYYovlNtt8Av0bDaljvb9E9ZC3nYj
+cEZzocknCuDv+ZVlHryTM0XwtQTaFnC7vrtHRi1yjhgQAhZcR4Ukc1Q4jfbW9eOG
+FIRLx9U9jZUgY4Mk6R7+zAw5dpSDOtEoXryXnuKYhbqdvTNrNBiBCXST7RghyWzg
+BwFXq2LO38nvlrOKlkiJwoyDKfo9peVWBoaIGEYc3LFMVeQf/CYZa9Rsmziewjkn
+fmUbYSajrvwxLDvLjUXF7ddzBLR7R3WMS5aIL8bbEjauwLzYWFBXROaToCHzvMlr
+SpUmEvpzUNofyp2lKLYUH2XWiYTiN/3h6bkLlpFwNgDjiZ9FsajIfNaF33Yvhd5o
+NDcPxgNphhsqh4DiZ24ZV1M3vb+Prfgvy0tV4yEaVN9iXVsmrl/e/CVxgqW4qRoK
+HOroRp2ssNoCL6Jt2jhinsoTdaFPVLhTRlG9sBf59gOcglkcH9RyVI+UNF0WdtNa
+ciqCCBmat2lRide/yWAVRM7r/4ENVYDnYpGlbcrORM0FzY0b4qNhlVhQ+gITJ8zS
+KfX2KynIZziOG4TboGB5cR6QF7nGDEOSiNz8jGnBnxvFyb6z4XTpJsT/e4lcm0J1
+NNlVznU46EHg88s0aD4a47beMyZ1XoIO4DVYN9Qn2H771xVi6oZ0rJJ4c4FYxl/4
+AhF2loFrCEnlZw==
+=u0eg
 -----END PGP PUBLIC KEY BLOCK-----
-

src/assets/styles/components/_banner.scss

@@ -104,7 +104,7 @@ body.is-loading {
 .particle {
   position: relative;
   user-select: none;
-  background: _palette(accent3, bg);
+  background: _palette(bg);
 
   @include breakpoint(medium) {
     background: none;

src/assets/styles/libs/_drac.scss

@@ -0,0 +1,13 @@
+$background: #282a36;
+$current-line: #44475a;
+$selection: #44475a;
+$foreground: #f8f8f2;
+$dark-foreground: mix($foreground, #000, 90%);
+$comment: #6272a4;
+$cyan: #8be9fd;
+$green: #50fa7b;
+$orange: #ffb86c;
+$pink: #ff79c6;
+$purple: #bd93f9;
+$red: #ff5555;	
+$yellow: #f1fa8c;

src/assets/styles/libs/_vars.scss

@@ -1,3 +1,5 @@
+@import "drac";
+
 // Misc.
   $misc: (
     max-spotlights:   10,
@@ -31,20 +33,20 @@
 
 // Palette.
   $palette: (
-    bg:         #29335C,
+    bg:         $background,
-    fg:         #fff,
+    fg:         $foreground,
-    fg-bold:      #fff,
+    fg-bold:      $foreground,
-    fg-light:     rgba(255,255,255,0.5),
+    fg-light:     rgba($foreground, 0.5),
-    border:       #fff,
+    border:       $foreground,
     border-bg:      rgba(144,144,144,0.25),
-    border2:      #fff,
+    border2:      $foreground,
     border2-bg:     rgba(144,144,144,0.5),
 
     accent1: (
-      bg:       #F3A712,
+      bg:       $pink,
       fg-bold:    #ffffff,
-      fg:       mix(#F3A712, #ffffff, 25%),
+      fg:       mix($pink, #ffffff, 25%),
-      fg-light:   mix(#F3A712, #ffffff, 40%),
+      fg-light:   mix($pink, #ffffff, 40%),
       border:     rgba(0,0,0,0.125),
       border-bg:    rgba(255,255,255,0.075),
       border2:    rgba(0,0,0,0.25),
@@ -63,10 +65,10 @@
     ),
 
     accent3: (
-      bg:       #ed4933,
+      bg:       $red,
-      fg-bold:    #ffffff,
+      fg-bold:    $foreground,
-      fg:       mix(#ed4933, #ffffff, 25%),
+      fg:       #282a36,//mix($nord11, #ffffff, 25%),
-      fg-light:   mix(#ed4933, #ffffff, 40%),
+      fg-light:   #282a36,
       border:     rgba(0,0,0,0.125),
       border-bg:    rgba(255,255,255,0.075),
       border2:    rgba(0,0,0,0.25),
@@ -74,10 +76,10 @@
     ),
 
     accent4: (
-      bg:       #25558C,
+      bg:       mix(#44475a, #000, 50%),
-      fg-bold:    #ffffff,
+      fg-bold:    $foreground,
-      fg:       mix(#25558C, #ffffff, 25%),
+      fg:       $dark-foreground,
-      fg-light:   mix(#25558C, #ffffff, 40%),
+      fg-light:   $dark-foreground,
       border:     rgba(0,0,0,0.125),
       border-bg:    rgba(255,255,255,0.075),
       border2:    rgba(0,0,0,0.25),
@@ -87,8 +89,8 @@
     accent5: (
       bg:       #e2e2e2,
       fg-bold:    #ffffff,
-      fg:       mix(#F3A712, #ffffff, 25%),
+      fg:       mix($pink, #ffffff, 25%),
-      fg-light:   mix(#F3A712, #ffffff, 40%),
+      fg-light:   mix($pink, #ffffff, 40%),
       border:     rgba(0,0,0,0.125),
       border-bg:    rgba(255,255,255,0.075),
       border2:    rgba(0,0,0,0.25),

src/assets/svg/Gitea_Logo.svg

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="512" height="512" viewBox="0 0 135.46667 135.46667" version="1.1" id="svg8" sodipodi:docname="logo.svg" inkscape:version="0.92.1 r15371" inkscape:export-filename="" inkscape:export-xdpi="48.000004" inkscape:export-ydpi="48.000004">
-  <defs id="defs2"/>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="0.70710678" inkscape:cx="418.13805" inkscape:cy="177.57445" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" units="px" width="256px" showguides="false" inkscape:window-width="1920" inkscape:window-height="1137" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:pagecheckerboard="false" inkscape:measure-start="283.373,243.952" inkscape:measure-end="290.267,236.527">
-    <sodipodi:guide position="0,0" orientation="0,512" id="guide3699" inkscape:locked="false"/>
-    <sodipodi:guide position="135.46667,0" orientation="-512,0" id="guide3701" inkscape:locked="false"/>
-    <sodipodi:guide position="135.46667,135.46667" orientation="0,-512" id="guide3703" inkscape:locked="false"/>
-    <sodipodi:guide position="0,135.46667" orientation="512,0" id="guide3705" inkscape:locked="false"/>
-  </sodipodi:namedview>
-  <metadata id="metadata5">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-161.53334)" style="display:inline">
-    <path style="fill:#ffffff;fill-opacity:1;stroke:#428f29;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" d="m 27.709937,195.15095 c -9.546573,-0.0272 -22.3392732,6.79805 -21.6317552,23.90397 1.105534,26.72889 25.4565952,29.20839 35.1916502,29.42301 1.068023,5.01357 12.521798,22.30563 21.001818,23.21667 h 37.15277 c 22.27763,-1.66785 38.9607,-75.75671 26.59321,-76.03825 -46.781583,2.47691 -49.995146,2.13838 -88.599758,0 -2.495053,-0.0266 -5.972321,-0.49474 -9.707935,-0.5054 z m 2.491319,9.45886 c 1.351378,13.69267 3.555849,21.70359 8.018216,33.94345 -11.382872,-1.50473 -21.069822,-5.22443 -22.851515,-19.10984 -0.950962,-7.4112 2.390428,-15.16769 14.833299,-14.83361 z" id="path3722" inkscape:connector-curvature="0" sodipodi:nodetypes="sscccccsccsc"/>
-  </g>
-  <g inkscape:groupmode="layer" id="layer2" inkscape:label="Layer 2" style="display:inline">
-    <rect style="display:inline;fill:#1d2442;fill-opacity:1;stroke:none;stroke-width:0.24757317;stroke-opacity:1" id="rect4599" width="34.762054" height="34.762054" x="87.508659" y="18.291576" transform="rotate(25.914715)" ry="5.4825778"/>
-    <path style="display:inline;fill:#1d2442;fill-opacity:1;stroke:none;stroke-width:0.26644793px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 79.804947,57.359056 3.241146,1.609954 V 35.255731 h -3.262698 z" id="path4525" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
-  </g>
-  <g inkscape:groupmode="layer" id="layer3" inkscape:label="Layer 3" style="display:inline">
-    <g style="display:inline" id="g4539">
-      <circle transform="rotate(-19.796137)" r="3.4745038" cy="90.077766" cx="49.064713" id="path4606" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"/>
-      <circle transform="rotate(-19.796137)" r="3.4745038" cy="102.1049" cx="36.810425" id="path4606-3" style="fill:#ffffff6;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"/>
-      <circle transform="rotate(-19.796137)" r="3.4745038" cy="111.43928" cx="46.484283" id="path4606-1" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"/>
-      <rect transform="rotate(26.024158)" y="18.061695" x="97.333458" height="27.261492" width="2.6726954" id="rect4629-8" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27444693;stroke-opacity:1"/>
-      <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4514" d="m 76.558096,68.116343 c 12.97589,6.395378 13.012989,4.101862 4.890858,20.907244" style="fill:none;stroke:#ffffff;stroke-width:2.68000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
-    </g>
-  </g>
-</svg>

src/assets/svg/rss-square-solid.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="rss-square" class="svg-inline--fa fa-rss-square fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#ffffff" d="M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zM112 416c-26.51 0-48-21.49-48-48s21.49-48 48-48 48 21.49 48 48-21.49 48-48 48zm157.533 0h-34.335c-6.011 0-11.051-4.636-11.442-10.634-5.214-80.05-69.243-143.92-149.123-149.123-5.997-.39-10.633-5.431-10.633-11.441v-34.335c0-6.535 5.468-11.777 11.994-11.425 110.546 5.974 198.997 94.536 204.964 204.964.352 6.526-4.89 11.994-11.425 11.994zm103.027 0h-34.334c-6.161 0-11.175-4.882-11.427-11.038-5.598-136.535-115.204-246.161-251.76-251.76C68.882 152.949 64 147.935 64 141.774V107.44c0-6.454 5.338-11.664 11.787-11.432 167.83 6.025 302.21 141.191 308.205 308.205.232 6.449-4.978 11.787-11.432 11.787z"></path></svg>

src/gdpr.md

@@ -1,29 +0,0 @@
----
-layout: page
-title: Privacy Policy
-description: Privacy policy for Autonomic Co-operative Limited.
-meta_description: This is the privacy policy for Autonomic Co-operative Limited.
----
-
-# Autonomic Cooperative Limited General Data Protection Regulation 2016 (GDPR) Privacy Notice.
-
-Our purpose is to provide secure services for socially responsible and progressive groups and individuals.
-
-To get in touch with Autonomic Cooperative Limited about any GPDR related issues please email [helo@autonomic.zone](helo@autonomic.zone). Our Secretary will act as contact for these matters. We do not have or believe we require a Data Protection Officer, as we do not process sensitive data, nor do our core activities require large scale systemic tracking of individuals. See the [ICO guidance](https://ico.org.uk/for-organisations/guide-to-the-general-data-protection-regulation-gdpr/accountability-and-governance/data-protection-officers/) on this.
-
-If you use our services, we may act as data processor for you. We provide information about how our systems and procedures allow you to use our service securely in our information security policy.
-
-We process data to provide Internet services. We collect names, addresses, email addresses, phone numbers of our customers so we can charge them for services and communicate with them information regarding the availability and status of their services. This processing is necessary for the performance of our contracts with them.
-
-This data is processed by our staff and only stored in the EU. We do not share data with 3rd parties unless this is required for the implementation of a specific service. For example to a Domain Name Registrar to complete the whois information for a domain name. The requirement to share with 3rd parties will be clearly communicated to you, and only done with explicit consent.
-
-We are required under UK tax law to keep your basic personal data (name, address, contact details) for a minimum of 6 years after which time it will be destroyed.
-
-If at any point you believe the information we process on you is incorrect you request to see this information and even have it corrected or deleted. If you wish to raise a complaint on how we have handled your personal data, you can contact our Secretary [helo@autonomic.zone](mailto:helo@autonomic.zone) who will investigate the matter.
-
-See also our website privacy policy.
-
-We use servers hosted by [Webarchitects](https://www.webarch.net/privacy-notice), [Hetzner](https://www.hetzner.com/rechtliches/datenschutz) and [Digital Ocean](https://www.digitalocean.com/legal/gdpr/) and [Gandi](https://contract.gandi.net/v5/contracts/36637/Privacy_Policy_SAS_1.1_en.pdf) for Domain names, DNS and Email, so their Data Processing Agreements also apply.
-
-If you are not satisfied with our response or believe we are processing your personal data not in accordance with the law you can complain to the Information Commissioner’s Office (ICO).
- 

src/privacy.md

@@ -1,16 +0,0 @@
----
-layout: page
-title: Website Privacy Policy
-description: Privacy policy for autonomic.zone.
-meta_description: This is the privacy policy for the website of Autonomic co-operative.
----
-
-# Website Privacy Policy
-
-The Autonomic Co-operative Limted website privacy policy.
-
-Our Privacy Notice contains information regarding our General Data Protection Regulation 2016 (GDPR) compliance.
-
-This site does not set cookies. The source code for this website can be found [here](https://git.autonomic.zone/autonomic-cooperative/autonomic.zone).
-
-This site is configured to collect statistics including IP addresses via web server log files as is standard practice. The log files are kept for 28 days or less and are then deleted. We reccomend you use Tor Browser if you require great anonoymity.

src/terms.md

@@ -1,68 +0,0 @@
----
-layout: page
-title: Terms of Service
-description: Terms of Service for autonomic.zone.
-meta_description: This is the Terms of Service for Autonomic Co-operative Limited.
----
-
-# Terms of service
-
-This document describes what activities are allowed, under what conditions we may terminate your account, and asserts our limited liability. It applies to all interactions with Autonomic Cooperative Limited. Your use of Autonomic Cooperative Limited services constitutes your agreement to these Terms of Service.
-
-## Summary
-
-If you do anything truly evil, we will terminate your account. We are not liable for any damages related to the use of this service. You agree to hold patience in your heart for the hard work we do.
-
-## Privacy policies
-
-We ask that you review our Privacy Policy, so that you are aware of how we collect and use your information.
-
-## Ownership of and responsibility for content
-
-All Content, whether publicly posted or privately transmitted, is the sole responsibility of the person who originated such Content. We may not monitor or control the Content posted via the Services and we cannot take responsibility for such Content. Any use or reliance on any Content or materials posted via the Services or obtained by you through the Services is at your own risk. You are responsible for your use of the Services, for any Content you provide, and for any consequences thereof.
-
-### Refraining from certain activities
-
-You may not engage in the following activities through the services provided by Autonomic Cooperative Limited:
-
-- Harassing or abusing others by engaging in threats, stalking or sending spam. This includes usernames, aliases or using any of our resources for this purpose.
-- Misuse of services by distributing viruses or malware, engaging in a denial of service attack, or attempting to gain unauthorized access to any computer system, including this one.
-- Contributing to the abuse of others by distributing material where the production process created violence or sexual assault against persons.
-
-## Account Termination
-
-Autonomic Cooperative Limited may terminate your service at any time for any reason. Typically, however, accounts are destroyed because of one of the following conditions:
-
-- The account has been found to be sending Spam (excessive amounts of unsolicited email).
-- The account has engaged one or more of the banned activities listed above.
-
-Limitation on Liability
-
-You agree that Autonomic Cooperative Limited is not liable to you or to any other party for any direct, indirect, incidental, special, consequential or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data, or other intangible losses, regardless of whether we were advised of the possibility of such damage. In the case that applicable law may not allow the limitation or exclusion of liability or incidental or consequential damages, the above limitation or exclusion may not apply to you, although our liability will be limited to the fullest extent permitted by applicable law.
-
-### Choice of Forum and Law
-
-You agree that these Terms of Service and your use of Autonomic Cooperative Limited is governed by the law of United Kingdom.
-
-### Policy regarding copyright infringement - DMCA
-
-Autonomic Cooperative Limited complies with the Digital Millennium Copyright Act’s notice and take-down procedures. DMCA complaints should be addressed to:
-
-Autonomic Cooperative Limited
-1539 Pershore Road
-Birmingham
-B30 2JH
-United Kingdom
-
-[mailto:helo@autonomic.zone](helo@autonomic.zone)
-
-Please note that it is Autonomic Cooperative Limited’s policy to take reasonable steps, within our power, to terminate the accounts of users who are repeat infringers in appropriate circumstances.
-
-### No Warranty
-
-You understand and agree that Autonomic Cooperative Limited provides online services “as is” and without any warranty, express, implied, or statutory. We specifically disclaim any implied warrannties of title, merchantability, fitness for a particularly purpose and non-infringement. We make no warranty as to the reliability, accessibility, or quality of our services. You agree that the use of our services is at your sole and exclusive risk.
-
-### Changes to this policy
-
-We reserve the right to change this policy. If we make major changes, we will notify our users in a clear and prominent manner.
-