mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-04-27 11:17:49 +02:00
fixing conflicts
This commit is contained in:
parent
42d3770b14
commit
347a2c2150
11 changed files with 205 additions and 55 deletions
6
android/.gitignore
vendored
6
android/.gitignore
vendored
|
@ -5,4 +5,8 @@ ant.properties
|
|||
local.properties
|
||||
build.sh
|
||||
bin
|
||||
log*
|
||||
log*
|
||||
.gradle*
|
||||
build
|
||||
assets
|
||||
gradle-app.setting
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue