Skip to content

Commit 95e3ed9

Browse files
author
unknown
committed
Merge branch 'release/1.0'
2 parents ab5cd59 + 2a25c86 commit 95e3ed9

File tree

90 files changed

+1497
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1497
-375
lines changed

.gitignore

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
*.iml
22
.gradle
3-
/local.properties
3+
local.properties
44
/.idea/workspace.xml
55
/.idea/libraries
66
.DS_Store
77
/build
88
/captures
99
.externalNativeBuild
10+
11+
\.idea/vcs\.xml
12+
13+
app/src/main/res/drawable/
14+
\.idea/
15+
app/src/main/res/drawable-xxhdpi/
16+
app/src/main/res/drawable-xhdpi/
17+
app/src/main/res/drawable-hdpi/

.idea/.name

-1
This file was deleted.

.idea/compiler.xml

-22
This file was deleted.

.idea/copyright/profiles_settings.xml

-3
This file was deleted.

.idea/encodings.xml

-6
This file was deleted.

.idea/gradle.xml

-19
This file was deleted.

.idea/misc.xml

-176
This file was deleted.

.idea/modules.xml

-10
This file was deleted.

.idea/runConfigurations.xml

-12
This file was deleted.

0 commit comments

Comments
 (0)