diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-01-11 16:45:02 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-11 16:45:02 +0100 |
| commit | 8b942c746b51410f334b7303699a5ac740513ae3 (patch) | |
| tree | 44ee46517c9f551ad77ca7ab405ba5bd981c5e4f /app/assets/urls | |
| parent | fba19da668411f722773617b2f09726701bc3ea8 (diff) | |
| parent | 68d6eb91436d0d145fd340056fd8000f7dd1ff34 (diff) | |
Merge remote-tracking branch '0xacab/0.9.8' into 8802_drawer
Diffstat (limited to 'app/assets/urls')
| -rw-r--r-- | app/assets/urls/calyx.net.url (renamed from app/assets/urls/calyx.url) | 0 | ||||
| -rw-r--r-- | app/assets/urls/demo.bitmask.net.url (renamed from app/assets/urls/bitmask demo.url) | 0 | ||||
| -rw-r--r-- | app/assets/urls/riseup.net.url (renamed from app/assets/urls/riseup.url) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.net.url index 8de04fe9..8de04fe9 100644 --- a/app/assets/urls/calyx.url +++ b/app/assets/urls/calyx.net.url diff --git a/app/assets/urls/bitmask demo.url b/app/assets/urls/demo.bitmask.net.url index 1a412055..1a412055 100644 --- a/app/assets/urls/bitmask demo.url +++ b/app/assets/urls/demo.bitmask.net.url diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.net.url index 4548b433..4548b433 100644 --- a/app/assets/urls/riseup.url +++ b/app/assets/urls/riseup.net.url |