Merge branch 'DEV-tbirkas'

sed-szeged · Jun 21, 2018 · b71c396 · b71c396
2 parents a929dfa + 95e578c
commit b71c396
Show file tree

Hide file tree

Showing 128 changed files with 2,626 additions and 2,625 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/aFileChooser/build.gradle b/aFileChooser/build.gradle
diff --git a/aFileChooser/src/main/AndroidManifest.xml b/aFileChooser/src/main/AndroidManifest.xml
diff --git a/aFileChooser/src/main/java/com/ianhanniballake/localstorage/LocalStorageProvider.java b/aFileChooser/src/main/java/com/ianhanniballake/localstorage/LocalStorageProvider.java