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

Conflicts:
	_data/services.yaml
This commit is contained in:
ohrensessel 2015-01-14 20:53:14 +01:00
commit ddd6a113d1

View file

@ -3,6 +3,10 @@
# .com: # .com:
# network: public # network: public
# #
# Pick your icon from here:
# https://fortawesome.github.io/Font-Awesome/icons/
# the fa- is added automatically
#
#- title: Blogs #- title: Blogs
# text: Worpress im Freifunk-Netz # text: Worpress im Freifunk-Netz
# icon: quote-right # icon: quote-right