Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
k0rmarun committed May 30, 2019
2 parents 36e0104 + c123edd commit 0d02435
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions README.md
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.

0 comments on commit 0d02435

Please sign in to comment.