iris
/
neotel-website
1
2
Fork 2
Code Issues Pull Requests 1 Releases Activity

attempt to merge fixes

This commit is contained in:
Brendan Webb 2021-11-25 19:57:53 +11:00
parent fe7da2edc0
commit 706a3577c9
3 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.html
View File

@ -8,7 +8,10 @@ layout: base
<ul class="inline-list"> <ul class="inline-list">
<li><a href="/phonebook/">phonebook</a></li> <li><a href="/phonebook/">phonebook</a></li>
<li><a href="/the-original/">the original</a></li> <li><a href="/the-original/">the original</a></li>
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<li><a href="https://tel.tilde.org.nz/register/">request account</a></li> <li><a href="https://tel.tilde.org.nz/register/">request account</a></li>
=======
>>>>>>> Revert "add "register" link to the homepage"
</ul> </ul>
</main> </main>

10
phonebook/index.html
View File

@ -27,10 +27,20 @@ title: phonebook
<h2>The community</h2> <h2>The community</h2>
<p> <p>
<<<<<<< HEAD
Want a <code>tel.tilde.org.nz</code> number? Want a <code>tel.tilde.org.nz</code> number?
<a href="https://tel.tilde.org.nz/register/"> <a href="https://tel.tilde.org.nz/register/">
Click here for the registration form! Click here for the registration form!
</a> </a>
=======
To get a <code>tel.tilde.org.nz</code> number, please message <code>darcy</code>
in <code>#tildetel</code> on <a href="https://tilde.chat">the tilde.chat IRC</a>.
</p>
<p>
If you had a <code>tilde.tel</code> number, in most cases, you can use that number
on <code>tel.tilde.org.nz</code>! Just let <code>darcy</code> know when asking for
an account.
>>>>>>> Revert "add "register" link to the homepage"
</p> </p>
<table> <table>

68
the-original/20210120-rip-tilde-tel.txt
View File

@ -1,34 +1,34 @@
---------------------------------------- ----------------------------------------
rip tilde.tel rip tilde.tel
January 20th, 2021 January 20th, 2021
---------------------------------------- ----------------------------------------
yesterday, the almighty tilde.tel was shuttered. yesterday, the almighty tilde.tel[1] was shuttered.
not gonna lie, by the time i found out, i was quite saddened. not gonna lie, by the time i found out, i was quite saddened.
dammit, cat! now i've gotta go delete all my softphones! :p dammit, cat! now i've gotta go delete all my softphones! :p
in all seriousness, despite its deadness, it was fun while it in all seriousness, despite its deadness, it was fun while it
lasted. lasted.
rest in peace, tilde.tel. rest in peace, tilde.tel.
------ ------
/ \ / \
/ RIP \ / RIP \
/ \ / \
| TILDE.TEL | | TILDE.TEL |
| | | |
| 2019-2021 | | 2019-2021 |
| | | |
| "ring ring, | | "ring ring, |
| mother- | | mother- |
| fucker." | | fucker." |
| | | |
---------------- ----------------