Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 607a3aeeb1e5
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c7319abe7b92
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 20, 2020

  1. Revert NixCon team page change

    @davidak
    davidak committed Apr 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c7319ab View commit details
Showing with 4 additions and 6 deletions.
  1. +2 −2 community.tt
  2. +2 −4 teams/nixcon.tt
4 changes: 2 additions & 2 deletions community.tt
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
<h3>Forum</h3>
<p>The official forum is the right place to get help from other users and discuss the development of the projects. There are also Announcements, Job offers and Events.</p>
<div class="text-center">
<a class="btn btn-success"
<a class="btn btn-block btn-success"
href="https://discourse.nixos.org/">Go to Discourse Forum</a>
</div>
</div>
@@ -22,7 +22,7 @@
<p>Another place to get in contact with other users is the official IRC channel:</p>
<p><a href="irc://irc.freenode.net/#nixos">#nixos</a> on the <a href="https://freenode.net/">freenode network</a> (<a href="https://logs.nix.samueldr.com/nixos/">logs</a> are available)</p>
<div class="text-center">
<a class="btn btn-success"
<a class="btn btn-block btn-success"
href="https://webchat.freenode.net/#nixos">Open Webchat</a>
</div>
</div>
6 changes: 2 additions & 4 deletions teams/nixcon.tt
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,6 @@
from any other OS/FOSS conference.
</div>

<div class="alert alert-info">
<strong>Help needed!</strong> <a href="https://discourse.nixos.org/t/help-organize-nixcon-2020/4901" class="alert-link">Help organize NixCon 2020!</a>
</div>

<h2>Members</h2>

<ul>
@@ -19,4 +15,6 @@
<li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
</ul>

<a href="https://discourse.nixos.org/t/help-organize-nixcon-2020/4901">Help organize NixCon 2020 !!!</a>

[% END %]