Merge branch 'master' into patch-2

This commit is contained in:
庄天翼 2018-03-10 12:05:34 +08:00 committed by GitHub
commit 5beb114816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 34 additions and 14 deletions

View File

@ -54,3 +54,10 @@ google-services.json
freeline.py freeline.py
freeline/ freeline/
freeline_project_description.json freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

View File

@ -1,6 +1,7 @@
# See https://www.dartlang.org/tools/private-files.html # See https://www.dartlang.org/guides/libraries/private-files
# Files and directories created by pub # Files and directories created by pub
.dart_tool/
.packages .packages
.pub/ .pub/
build/ build/

View File

@ -1,4 +1,4 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff: # User-specific stuff:
@ -9,7 +9,6 @@
# Sensitive or high-churn files: # Sensitive or high-churn files:
.idea/**/dataSources/ .idea/**/dataSources/
.idea/**/dataSources.ids .idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml .idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml .idea/**/sqlDataSources.xml
.idea/**/dynamic.xml .idea/**/dynamic.xml

View File

@ -1,5 +1,6 @@
# Binaries for programs and plugins # Binaries for programs and plugins
*.exe *.exe
*.exe~
*.dll *.dll
*.so *.so
*.dylib *.dylib

View File

@ -59,3 +59,6 @@ typings/
# parcel-bundler cache (https://parceljs.org/) # parcel-bundler cache (https://parceljs.org/)
.cache .cache
# next.js build output
.next

View File

@ -45,6 +45,7 @@ nosetests.xml
coverage.xml coverage.xml
*.cover *.cover
.hypothesis/ .hypothesis/
.pytest_cache/
# Translations # Translations
*.mo *.mo

View File

@ -1,5 +1,4 @@
# C++ objects and libs # C++ objects and libs
*.slo *.slo
*.lo *.lo
*.o *.o
@ -11,7 +10,6 @@
*.dylib *.dylib
# Qt-es # Qt-es
object_script.*.Release object_script.*.Release
object_script.*.Debug object_script.*.Debug
*_plugin_import.cpp *_plugin_import.cpp
@ -35,13 +33,11 @@ Makefile*
target_wrapper.* target_wrapper.*
# QtCreator # QtCreator
*.autosave *.autosave
# QtCtreator Qml # QtCreator Qml
*.qmlproject.user *.qmlproject.user
*.qmlproject.user.* *.qmlproject.user.*
# QtCtreator CMake # QtCreator CMake
CMakeLists.txt.user* CMakeLists.txt.user*

View File

@ -31,3 +31,6 @@ vignettes/*.pdf
# Temporary files created by R markdown # Temporary files created by R markdown
*.utf8.md *.utf8.md
*.knit.md *.knit.md
# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
rsconnect/

View File

@ -13,6 +13,8 @@ msg/*Feedback.msg
msg/*Goal.msg msg/*Goal.msg
msg/*Result.msg msg/*Result.msg
msg/_*.py msg/_*.py
build_isolated/
devel_isolated/
# Generated by dynamic reconfigure # Generated by dynamic reconfigure
*.cfgc *.cfgc

View File

@ -10,6 +10,7 @@
*.fot *.fot
*.cb *.cb
*.cb2 *.cb2
.*.lb
## Intermediate documents: ## Intermediate documents:
*.dvi *.dvi
@ -109,6 +110,14 @@ acs-*.bib
*.gaux *.gaux
*.gtex *.gtex
# htlatex
*.4ct
*.4tc
*.idv
*.lg
*.trc
*.xref
# hyperref # hyperref
*.brf *.brf

View File

@ -16,8 +16,8 @@
# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
# Make sure to include details from VisualStudio.gitignore BEFORE this # Make sure to include details from VisualStudio.gitignore BEFORE this
!**/App_Data/[Pp]ackages/ !**/App_Data/[Pp]ackages/*
!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
# ImageProcessor DiskCache # ImageProcessor DiskCache
**/App_Data/cache/ **/App_Data/cache/

View File

@ -237,6 +237,7 @@ _UpgradeReport_Files/
Backup*/ Backup*/
UpgradeLog*.XML UpgradeLog*.XML
UpgradeLog*.htm UpgradeLog*.htm
ServiceFabricBackup/
# SQL Server files # SQL Server files
*.mdf *.mdf
@ -258,9 +259,6 @@ FakesAssemblies/
.ntvs_analysis.dat .ntvs_analysis.dat
node_modules/ node_modules/
# TypeScript v1 declaration files
typings/
# Visual Studio 6 build log # Visual Studio 6 build log
*.plg *.plg