diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2014-02-26 22:57:28 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2014-02-26 22:57:28 +0100 |
| commit | da06687275d25430519365402e3be0800d612a68 (patch) | |
| tree | ea88c95ca78c16be540f84e3cd56e08fcd435350 /community/meetings.mdwn | |
| parent | 2674414598f3a95a9b2c84c418b17a7d27a9e524 (diff) | |
| parent | d216c51189addeaa03a0c92ac5d7708e004fa148 (diff) | |
Merge remote-tracking branch 'darnassus--hurd-web/master'
Conflicts:
community/meetings.mdwn
contributing.mdwn
hurd/translator/pfinet/implementation.mdwn
Diffstat (limited to 'community/meetings.mdwn')
| -rw-r--r-- | community/meetings.mdwn | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index bb90a2ab..1713ce3a 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -13,11 +13,9 @@ License|/fdl]]."]]"""]] # Upcoming - * [[FOSDEM_2014]] - - # Past + * [[FOSDEM_2014]] * [[GNU Hackers Meeting, 2013, Paris|ghm2013]] * [[FOSDEM_2013]] * [[GNU Hackers Meeting, 2012, Düsseldorf|ghm2012]] |