Merge branch 'master' of https://gitlab.com/kranklyboy/tiss2go
Conflicts: .gitignore
This commit is contained in:
+1
-1
@@ -109,4 +109,4 @@ pickle-email-*.html
|
||||
/html
|
||||
/pkg
|
||||
Gemfile.lock
|
||||
/.idea/tiss2go.iml
|
||||
.idea
|
||||
Reference in New Issue
Block a user