Skip to content
Snippets Groups Projects
Commit 0344ef48 authored by Johannes Rudolph's avatar Johannes Rudolph
Browse files

Merge branch 'master' of git.nordwest.freifunk.net:ffnw/siteconf 

# Conflicts:
#	site.conf
parents c1a45014 9af8cd70
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment