Merge branch 'master' of https://github.com/FullStackEmbedded/WeatherApp

Conflicts: .idea/.name .idea/gradle.xml .idea/misc.xml .idea/modules.xml .idea/vcs.xml
FullStackEmbedded · Feb 10, 2016 · 89375ed · 89375ed
2 parents 821876a + 5eac4f5
commit 89375ed
Show file tree

Hide file tree

Showing 11 changed files with 348 additions and 125 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
 /captures
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.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