Skip to content

Commit d4ed6cb

Browse files
committed
Merged branch master into master
2 parents bf5bae8 + b14daf6 commit d4ed6cb

77 files changed

Lines changed: 2764 additions & 2337 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
.idea
2+
.idea/*
13
.gradle
24
/local.properties
3-
/.idea/workspace.xml
4-
/.idea/libraries
55
.DS_Store
66
/build
77
/captures

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/dictionaries/andrewsosa.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)