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/meetings.mdwn | |
| parent | 095af72d2c6cf6269d2b139634183e7e53033a54 (diff) | |
| parent | a26cfb9c30ab60ca71d84f86d002b718f351efdc (diff) | |
Merge commit 'a26cfb9c30ab60ca71d84f86d002b718f351efdc'
Diffstat (limited to 'community/meetings.mdwn')
| -rw-r--r-- | community/meetings.mdwn | 4 |
1 files changed, 2 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]] |