Skip to content
Snippets Groups Projects
Commit 0c06a181 authored by Anika Henke's avatar Anika Henke
Browse files

Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements 

Conflicts:
	lib/tpl/dokuwiki/css/basic.css
parents ef7e36e4 5d0aaf95
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 340 additions and 2149 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