Skip to content

Commit

Permalink
Merge branch 'master' into update_flake_lock_action
Browse files Browse the repository at this point in the history
  • Loading branch information
garbas authored Nov 12, 2023
2 parents c41afc2 + 2d355d8 commit ae2d0f3
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions community/teams/nixcon.tt
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,13 @@
</section>

<section class="governance-team">

<aside>
<h2>Members</h2>
The NixCon team is transitioning.
<ul>
<li><a href="https://discourse.nixos.org/u/flokli">Florian Klink</a> (flokli)</li>
<li><a href="https://discourse.nixos.org/u/addict3d">Nick Bathum</a> (addict3d)</li>
<li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
<li><a href="https://discourse.nixos.org/t/governance-through-project-leads-in-nixcon-2024/33981">Governance through “project leads” in NixCon 2024</a></li>
</ul>
</aside>

</section>

[% END %]

0 comments on commit ae2d0f3

Please sign in to comment.