Merge branch 'master' of https://github.com/b3yond/ticketfrei

2017-12-10 20:20:39 +01:00 · 2017-12-10 20:20:39 +01:00 · 15d2c75b5a
parent 2c21fb09ca a4eef4b086
commit 15d2c75b5a
3 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@ bin/
 include/
 lib/
 share/
+local/
--- a/campaign/sex_pistols.jpeg
+++ b/campaign/sex_pistols.jpeg
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit c8e9d7fd7ae0fe04921fdcf85e11fc9c0c324958
				`@ -1 +0,0 @@`
				`Subproject commit c8e9d7fd7ae0fe04921fdcf85e11fc9c0c324958`