diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2015-10-07 21:38:30 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2015-10-07 21:38:30 +0200 |
| commit | b4c22bb08fa29f2747e3b77004821d2e9badb7e6 (patch) | |
| tree | 66cf904cd6b93ffd1893a19a955ca01798373bdd /community | |
| parent | 095af72d2c6cf6269d2b139634183e7e53033a54 (diff) | |
| parent | a26cfb9c30ab60ca71d84f86d002b718f351efdc (diff) | |
Merge commit 'a26cfb9c30ab60ca71d84f86d002b718f351efdc'
Diffstat (limited to 'community')
| -rw-r--r-- | community/meetings.mdwn | 4 | ||||
| -rw-r--r-- | community/meetings/debconf15.mdwn | 25 |
2 files changed, 27 insertions, 2 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index e136cbee..98ced949 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -13,11 +13,11 @@ License|/fdl]]."]]"""]] # Upcoming - * [[FOSDEM_2015]] - # Past + * [[DebConf15]] + * [[FOSDEM_2015]] * [[FOSDEM_2014]] * [[GNU Hackers Meeting, 2013, Paris|ghm2013]] * [[FOSDEM_2013]] diff --git a/community/meetings/debconf15.mdwn b/community/meetings/debconf15.mdwn new file mode 100644 index 00000000..f071b5d7 --- /dev/null +++ b/community/meetings/debconf15.mdwn @@ -0,0 +1,25 @@ +[[!meta copyright="Copyright © 2015 Free Software Foundation, Inc."]] + +[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable +id="license" text="Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no Invariant +Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license +is included in the section entitled [[GNU Free Documentation +License|/fdl]]."]]"""]] + +[[!meta title="DebConf15"]] + +<http://debconf15.debconf.org/> + + * {{$youpi_hurd}} + + +[[!ymlfront data=""" + +youpi_hurd: + + "presentation (including video) by Samuel Thibault: [*Debian GNU/Hurd Status update*](https://summit.debconf.org/debconf15/meeting/298/debian-gnuhurd-status-update/) + ([slides](http://people.debian.org/~sthibault/hurd-i386/2015-08-17-debconf.pdf)|[video](http://meetings-archive.debian.net/pub/debian-meetings/2015/debconf15/Debian_GNUHurd_status_update.webm)|[transcript](https://people.debian.org/~sthibault/hurd-i386/2015-08-17-debconf.txt))" + +"""]] |