Merge branch 'dev'

Conflicts: samples/pushchat/build.gradle
onepf · May 12, 2015 · 67c5726 · 67c5726
2 parents 5451e7f + 1c917e7
commit 67c5726
Show file tree

Hide file tree

Showing 131 changed files with 5,120 additions and 1,508 deletions.
diff --git a/.idea/analyzers/findbugs/exclude.xml b/.idea/analyzers/findbugs/exclude.xml
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml