API2

2015-12-16 00:28:15 +01:00
parent 9359567a8a
commit 2fcd55eb60
10 changed files with 1671 additions and 156 deletions
@@ -23,6 +23,9 @@ cache/*
 *.csr
 *.pem

+# Mergetool
+*.orgin
+
 # OS generated files #
 ######################
 .DS_Store?
@@ -32,7 +35,7 @@ Icon?
 Thumbs.db

 #Ignore files generated by PyCharm
-.idea/*
+*.idea/*

 #Ignore files generated by vi
 *.swp