-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/master'
- Loading branch information
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
# 34c3-companion-jolla | ||
# harbour-chaoscompanion | ||
|
||
Your schedule companion app for the chaos events: | ||
- congress (34c3) | ||
- gpn | ||
- mrmcd | ||
- Chaos Communication Congress (congress / c3) | ||
- Gulasch Programmier Nacht (GPN) | ||
- Meta Rhein Main Chaos Days (MRMCD) | ||
|
||
Any FRAB ("Fahrplan") compatible event can be added. | ||
Any [FRAB](http://frab.github.io/frab/) ("Fahrplan") compatible event can be added. |