Commit ac457b92 authored by maurice's avatar maurice

Merge origin/master

Conflicts:
	.gitignore
parent 4b842f2a
Gianadda
========
Yet another gallery generator.
A static gallery generator for hikers and bikers
For more information, see the [Wiki pages](https://github.com/robbyn/gianadda/wiki/)
For more information, see the [Project pages](http://gianadda.perry.productions/)
Markdown is supported
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