chore(merging-upstream): bunch of conflicts to solve
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -9,3 +9,5 @@
|
||||
.cxx
|
||||
local.properties
|
||||
*.jks
|
||||
*.keystore
|
||||
/mastodon/keystore/nightly_keystore.keystore
|
||||
|
||||
Reference in New Issue
Block a user