BrendanTCC
/
neotel-website
forked from iris/neotel-website
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: BrendanTCC:c167dfe4edcd84d3923a66cf4a26f1d975d99b23
Branches Tags
BrendanTCC:main
iris:main
...
compare: BrendanTCC:76bc2c91f0b65072b072095fda49b6b172a6d9e1
Branches Tags
BrendanTCC:main
iris:main

6 Commits
c167dfe4ed ... 76bc2c91f0

Author SHA1 Message Date
Brendan Webb 76bc2c91f0 Merge remote-tracking branch 'origin/main' into main 2021-11-25 19:58:27 +11:00
Brendan Webb 73eef5f7d1 update 20210120-rip-tilde-tel.txt 
reflects changes made on the original phlog post, available at gopher://brendo.org/0/phlog/20210120-rip-tilde-tel.txt
 2021-11-25 19:58:12 +11:00
Brendan Webb 706a3577c9 attempt to merge fixes 2021-11-25 19:57:53 +11:00
Brendan Webb fe7da2edc0 add "register" link to the homepage 
so darcy doesn't have to! :D
 2021-11-25 19:54:38 +11:00
Brendan Webb 535cb7962a add register link 
so darcy doesn't have to
 2021-11-25 19:52:53 +11:00
Brendan Webb d46636df9c fix tiny little typo in my post 
i'll update this on my phlog right after submitting the PR.
if you don't see the change, please remind me.
 2021-11-25 19:52:53 +11:00
2 changed files with 14 additions and 0 deletions
Show Stats Expand all files Collapse all files

4
index.html
View File

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

10
phonebook/index.html
View File

@ -27,10 +27,20 @@ title: phonebook
<h2>The community</h2>
<p>
<<<<<<< HEAD
Want a <code>tel.tilde.org.nz</code> number?
<a href="https://tel.tilde.org.nz/register/">
Click here for the registration form!
</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>
<table>