Commit a3d45dd7 authored by Christopher Spinrath's avatar Christopher Spinrath
Browse files

Merge branch 'master' of fs-git:lip

parents 884e32e2 2200565b
......@@ -9,3 +9,4 @@
*.fls
*.DS_Store
*~ #editor temp files
*.pyc
Supports Markdown
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