Merge upstream changes

This commit is contained in:
Ray Fang
2016-01-27 14:36:41 +08:00
62 changed files with 545 additions and 131 deletions

View File

@@ -1,4 +1,4 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference https://intellij-support.jetbrains.com/entries/23393067
# User-specific stuff:
@@ -38,3 +38,4 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties