Merge branch 'master' of github.com:freifunkhamburg/start-ffhh

Conflicts: _data/services.yaml
2015-01-14 20:53:14 +01:00 · 2015-01-14 20:53:14 +01:00 · ddd6a113d1
parent c1498835f6 4aae464ae6
commit ddd6a113d1
1 changed files with 4 additions and 0 deletions
--- a/_data/services.yaml
+++ b/_data/services.yaml
@ -3,6 +3,10 @@
 # .com:
 # network: public
 #
+# Pick your icon from here:
+# https://fortawesome.github.io/Font-Awesome/icons/
+# the fa- is added automatically
+#
 #- title:    Blogs
 #  text:     Worpress im Freifunk-Netz
 #  icon:     quote-right