]> source.dussan.org Git - gitignore.git/log
gitignore.git
7 years agoAdd two CR characters to ignore Icon? 2337/head
Spencer Mathews [Tue, 28 Mar 2017 21:42:51 +0000 (14:42 -0700)]
Add two CR characters to ignore Icon?

7 years agoChange macOS to UNIX line endings
Spencer Mathews [Tue, 28 Mar 2017 21:32:40 +0000 (14:32 -0700)]
Change macOS to UNIX line endings

7 years agoMerge pull request #2331 from cptaffe/master
Brendan Forster [Thu, 23 Mar 2017 22:38:54 +0000 (09:38 +1100)]
Merge pull request #2331 from cptaffe/master

Rails gitignore misuses double-asterisk

7 years agoDouble-asterisk misuse 2331/head
Connor Taffe [Thu, 23 Mar 2017 16:09:50 +0000 (11:09 -0500)]
Double-asterisk misuse

`**.` is invalid

7 years agoMerge pull request #2321 from matt40k/patch-1
Brendan Forster [Mon, 13 Mar 2017 23:29:10 +0000 (09:59 +1030)]
Merge pull request #2321 from matt40k/patch-1

Add ignore for Secondary data files

7 years agoAdd ignore for Secondary data files 2321/head
Matt Smith [Mon, 13 Mar 2017 10:13:39 +0000 (10:13 +0000)]
Add ignore for Secondary data files

Secondary data files .ndf (https://msdn.microsoft.com/en-us/library/ms189563.aspx)

7 years agoMerge pull request #2319 from kevmoo/patch-1
Brendan Forster [Mon, 13 Mar 2017 00:44:35 +0000 (08:44 +0800)]
Merge pull request #2319 from kevmoo/patch-1

Drastically simplify .gitignore for Dart

7 years agoMerge pull request #2320 from Cantido/master
Brendan Forster [Mon, 13 Mar 2017 00:43:55 +0000 (08:43 +0800)]
Merge pull request #2320 from Cantido/master

Add Cursive's REPL history file

7 years agoAdd Cursive's REPL history file 2320/head
Robert Richter [Sun, 12 Mar 2017 16:37:13 +0000 (11:37 -0500)]
Add Cursive's REPL history file

**Reasons for making this change:**

The file `replstate.xml` contains the history of the Clojure REPL
that Cursive adds to IntelliJ. Obviously that's user-specific,
and not relevant to other users.

**Links to documentation supporting these rule changes:**

This file is not well-documented, but in cursive-ide/cursive#1325,
the Cursive developers state that this is the REPL history file,
and that deleting it is acceptable troubleshooting if it's
causing trouble.

7 years agoMerge pull request #2318 from bbodenmiller/patch-3
Brendan Forster [Sun, 12 Mar 2017 04:25:06 +0000 (12:25 +0800)]
Merge pull request #2318 from bbodenmiller/patch-3

remove extra line

7 years agoUpdate Dart.gitignore 2319/head
Kevin Moore [Sat, 11 Mar 2017 21:41:43 +0000 (13:41 -0800)]
Update Dart.gitignore

7 years agoUpdate Dart.gitignore
Kevin Moore [Sat, 11 Mar 2017 21:41:14 +0000 (13:41 -0800)]
Update Dart.gitignore

7 years agoDrastically simplify .gitignore for Dart
Kevin Moore [Sat, 11 Mar 2017 00:32:54 +0000 (16:32 -0800)]
Drastically simplify .gitignore for Dart

Our typical workflow has JS and related build outputs in the `build` directory.

Most users are on new SDKs, so we don't have to worry about these ignores.
Most users don't generate docs locally. If they do, it's easy to add the entry to their .gitignore later.

7 years agoremove extra line 2318/head
Ben Bodenmiller [Fri, 10 Mar 2017 22:43:32 +0000 (14:43 -0800)]
remove extra line

7 years agoMerge pull request #2312 from Yousha/patch-1
Brendan Forster [Tue, 7 Mar 2017 00:31:32 +0000 (11:31 +1100)]
Merge pull request #2312 from Yousha/patch-1

Remove Composer's file and directory from Symfony.

7 years agoRemove Composer's file and directory. 2312/head
Yousha Aleayoub [Mon, 6 Mar 2017 15:46:06 +0000 (19:16 +0330)]
Remove Composer's file and directory.

7 years agoMerge pull request #2305 from robinhultman/visualstudio-biztalk
Markus Olsson [Thu, 2 Mar 2017 12:59:59 +0000 (13:59 +0100)]
Merge pull request #2305 from robinhultman/visualstudio-biztalk

Added BizTalk build output files to ignore list

7 years agoAdded BizTalk build output files to ignore list 2305/head
Robin Hultman [Wed, 1 Mar 2017 09:32:17 +0000 (10:32 +0100)]
Added BizTalk build output files to ignore list

7 years agoMerge pull request #2302 from dopefishh/tex-remove-dups
Brendan Forster [Tue, 28 Feb 2017 10:38:09 +0000 (21:38 +1100)]
Merge pull request #2302 from dopefishh/tex-remove-dups

TeX: remove duplicates

7 years agoTeX: remove duplicates 2302/head
Mart Lubbers [Tue, 28 Feb 2017 10:27:43 +0000 (11:27 +0100)]
TeX: remove duplicates

7 years agoMerge pull request #2301 from MichaelKogan/VS-JustMock_Config
Brendan Forster [Tue, 28 Feb 2017 10:11:34 +0000 (21:11 +1100)]
Merge pull request #2301 from MichaelKogan/VS-JustMock_Config

Added Telerik's JustMock configruation files

7 years agoAdded Telerik's JustMock configruation files 2301/head
MichaelKogan [Tue, 28 Feb 2017 07:15:00 +0000 (09:15 +0200)]
Added Telerik's JustMock configruation files

7 years agoMerge pull request #2292 from jlabarbera11/master
Brendan Forster [Wed, 22 Feb 2017 21:21:49 +0000 (08:21 +1100)]
Merge pull request #2292 from jlabarbera11/master

Added /project/project to PlayFramework.gitignore

7 years agoAdded /project/project to PlayFramework.gitignore 2292/head
Joe LaBarbera [Wed, 22 Feb 2017 16:41:54 +0000 (08:41 -0800)]
Added /project/project to PlayFramework.gitignore

https://www.playframework.com/documentation/2.5.x/Anatomy

7 years agoMerge pull request #2291 from pmsosa/patch-1
Brendan Forster [Mon, 20 Feb 2017 09:23:13 +0000 (20:23 +1100)]
Merge pull request #2291 from pmsosa/patch-1

[Python Gitignore] Ignore Sage's parsed files

7 years agoUpdate Python.gitignore 2291/head
Pedro M. Sosa [Mon, 20 Feb 2017 07:52:08 +0000 (23:52 -0800)]
Update Python.gitignore

7 years ago[Python Gitignore] Ignore Sage's parsed files
Pedro M. Sosa [Mon, 20 Feb 2017 05:43:08 +0000 (21:43 -0800)]
[Python Gitignore] Ignore Sage's parsed files

Ignore Sage's parsed files (*.sage.py) that are left after running a .Sage program.

7 years agoMerge pull request #2290 from aleixosk/master
Brendan Forster [Fri, 17 Feb 2017 14:11:21 +0000 (01:11 +1100)]
Merge pull request #2290 from aleixosk/master

Ignore dictionaries to reflect docs

7 years agoIgnore dictionaries to reflect docs 2290/head
Aleixo Sánchez [Fri, 17 Feb 2017 10:25:02 +0000 (11:25 +0100)]
Ignore dictionaries to reflect docs

7 years agoMerge pull request #2288 from sherzodv/eclipse-scala
Brendan Forster [Thu, 16 Feb 2017 20:33:49 +0000 (07:33 +1100)]
Merge pull request #2288 from sherzodv/eclipse-scala

[Eclipse] Add excludes kept in Scala.gitignore .

7 years agoMerge pull request #2289 from sherzodv/scala-cleanup
Brendan Forster [Thu, 16 Feb 2017 20:32:18 +0000 (07:32 +1100)]
Merge pull request #2289 from sherzodv/scala-cleanup

[Scala] remove external tools excludes.

7 years agoMerge pull request #2287 from sherzodv/sbt-scala
Brendan Forster [Thu, 16 Feb 2017 20:31:52 +0000 (07:31 +1100)]
Merge pull request #2287 from sherzodv/sbt-scala

[SBT] Add some excludes kept in Scala.gitignore .

7 years ago[SBT] Add some excludes kept in Scala.gitignore . 2287/head
sherzod [Thu, 16 Feb 2017 19:35:17 +0000 (00:35 +0500)]
[SBT] Add some excludes kept in Scala.gitignore .

Scala.gitignore currently has more entries for SBT than SBT.gitignore itself.
Copy missing entries here.

7 years ago[Eclipse] Add excludes kept in Scala.gitignore . 2288/head
sherzod [Thu, 16 Feb 2017 19:58:49 +0000 (00:58 +0500)]
[Eclipse] Add excludes kept in Scala.gitignore .

Scala.gitignore currently has more entries for Eclipse than Eclipse.gitignore
itself. Copy missing entries here.

7 years ago[Scala] remove external tools excludes. 2289/head
sherzod [Thu, 16 Feb 2017 20:01:42 +0000 (01:01 +0500)]
[Scala] remove external tools excludes.

Remove excludes for SBT, Eclipse and ENSIME. They'll be added to appropriate
Global/ gitignore files.

7 years agoMerge pull request #2068 from sherzodv/scala-ide-cache-main
Brendan Forster [Thu, 16 Feb 2017 10:58:39 +0000 (21:58 +1100)]
Merge pull request #2068 from sherzodv/scala-ide-cache-main

[Scala] exclude Scala IDE related .cache-main .

7 years agoMerge pull request #2285 from koppor/patch-4
Brendan Forster [Thu, 16 Feb 2017 10:56:50 +0000 (21:56 +1100)]
Merge pull request #2285 from koppor/patch-4

Update TeX.gitignore

7 years agoUpdate TeX.gitignore 2285/head
Oliver Kopp [Thu, 16 Feb 2017 10:06:57 +0000 (11:06 +0100)]
Update TeX.gitignore

minitoc also generates .stc, .slf, and .slt files

7 years agoPR WIP: Revert addition to Scala.gitignore 2068/head
sherzod [Thu, 16 Feb 2017 07:50:02 +0000 (12:50 +0500)]
PR WIP: Revert addition to Scala.gitignore

7 years agoMerge pull request #2284 from shiftkey/fastlane-tools
Brendan Forster [Wed, 15 Feb 2017 23:49:26 +0000 (10:49 +1100)]
Merge pull request #2284 from shiftkey/fastlane-tools

updated link to fastlane docs

7 years agoupdated link to fastlane docs 2284/head
Brendan Forster [Wed, 15 Feb 2017 23:47:31 +0000 (10:47 +1100)]
updated link to fastlane docs

7 years agoMerge pull request #2233 from tjkemper/patch-1
Brendan Forster [Wed, 15 Feb 2017 22:38:44 +0000 (09:38 +1100)]
Merge pull request #2233 from tjkemper/patch-1

[Maven] fix comment

7 years agoReword comment 2233/head
Taylor Kemper [Wed, 15 Feb 2017 21:00:41 +0000 (14:00 -0700)]
Reword comment

7 years agoMerge pull request #2281 from Stevoisiak/java-class-comment
Brendan Forster [Wed, 15 Feb 2017 09:20:23 +0000 (10:20 +0100)]
Merge pull request #2281 from Stevoisiak/java-class-comment

Add comment for Java .class files

7 years agoMerge pull request #2282 from vmuriart/patch-1
Brendan Forster [Wed, 15 Feb 2017 09:20:01 +0000 (10:20 +0100)]
Merge pull request #2282 from vmuriart/patch-1

Fix spelling

7 years agoFix spelling 2282/head
Victor Uriarte [Wed, 15 Feb 2017 01:04:00 +0000 (18:04 -0700)]
Fix spelling

7 years agoAdd comment for Java .class files 2281/head
Steven Vascellaro [Mon, 13 Feb 2017 22:02:12 +0000 (17:02 -0500)]
Add comment for Java .class files

7 years agoMerge pull request #2278 from erikghonyan/patch-1
Brendan Forster [Fri, 10 Feb 2017 08:00:12 +0000 (09:00 +0100)]
Merge pull request #2278 from erikghonyan/patch-1

Add missing space for the last comment

7 years agoAdd missing space for the last comment 2278/head
Erik Ghonyan [Thu, 9 Feb 2017 18:07:51 +0000 (19:07 +0100)]
Add missing space for the last comment

7 years agoMerge pull request #2277 from adjohnson916/yarn
Brendan Forster [Thu, 9 Feb 2017 08:20:54 +0000 (09:20 +0100)]
Merge pull request #2277 from adjohnson916/yarn

fix(Node): ignore yarn logs

7 years agofix(Node): ignore yarn logs 2277/head
Anders D. Johnson [Thu, 9 Feb 2017 06:13:21 +0000 (00:13 -0600)]
fix(Node): ignore yarn logs

This adds ignores for the `yarn-debug.log*` and `yarn-error.log*` files sometimes produced by the [Yarn package manager](https://yarnpkg.com).

7 years agoMerge pull request #2273 from tcthien/master
Brendan Forster [Fri, 3 Feb 2017 08:36:13 +0000 (09:36 +0100)]
Merge pull request #2273 from tcthien/master

Ignoring more generated file for Java project

7 years agoRemove the line for eclipse editor & vagrant sine it isn't already in global ignore 2273/head
Thien Tran [Fri, 3 Feb 2017 04:06:49 +0000 (11:06 +0700)]
Remove the line for eclipse editor & vagrant sine it isn't already in global ignore

7 years agoMerge pull request #2001 from wmarquardt/codeigniter3update
Brendan Forster [Thu, 2 Feb 2017 12:30:02 +0000 (13:30 +0100)]
Merge pull request #2001 from wmarquardt/codeigniter3update

Codeigniter 3 support

7 years agoMerge branch 'master' into codeigniter3update 2001/head
William Marquardt [Thu, 2 Feb 2017 11:36:10 +0000 (09:36 -0200)]
Merge branch 'master' into codeigniter3update

7 years agoMerge pull request #2112 from bbodenmiller/patch-3
Brendan Forster [Thu, 2 Feb 2017 11:00:34 +0000 (12:00 +0100)]
Merge pull request #2112 from bbodenmiller/patch-3

[Node/VisualStudio] ignore typings directory

7 years agoadded comment about typings directory 2112/head
Brendan Forster [Thu, 2 Feb 2017 10:59:53 +0000 (11:59 +0100)]
added comment about typings directory

7 years agoadded comment for typings directory
Brendan Forster [Thu, 2 Feb 2017 10:57:45 +0000 (11:57 +0100)]
added comment for typings directory

7 years agoMerge branch 'master' into patch-3
Brendan Forster [Thu, 2 Feb 2017 10:54:37 +0000 (11:54 +0100)]
Merge branch 'master' into patch-3

7 years agoMerge pull request #1606 from svisser/purescript
Brendan Forster [Thu, 2 Feb 2017 10:21:11 +0000 (11:21 +0100)]
Merge pull request #1606 from svisser/purescript

Added .gitignore for PureScript

7 years agoMerge pull request #1996 from tonylotts/master
Brendan Forster [Thu, 2 Feb 2017 10:13:13 +0000 (11:13 +0100)]
Merge pull request #1996 from tonylotts/master

Ignore ensime files

7 years agoMerge pull request #1424 from github/reduce-noise
Brendan Forster [Thu, 2 Feb 2017 09:56:07 +0000 (10:56 +0100)]
Merge pull request #1424 from github/reduce-noise

Add an explanation to reduce PHP framework clutter

7 years agoMerge pull request #2193 from rafaelstz/patch-7
Brendan Forster [Thu, 2 Feb 2017 09:53:09 +0000 (10:53 +0100)]
Merge pull request #2193 from rafaelstz/patch-7

[Magento] basic files that must be ignored

7 years agoMerge pull request #2246 from Nihlus/patch-1
Brendan Forster [Thu, 2 Feb 2017 09:20:32 +0000 (10:20 +0100)]
Merge pull request #2246 from Nihlus/patch-1

[Global/JetBrains] add support for Rider and nested projects

7 years agoMerge pull request #2256 from DSIW/patch-2 2025/head
Brendan Forster [Wed, 1 Feb 2017 16:57:14 +0000 (17:57 +0100)]
Merge pull request #2256 from DSIW/patch-2

[Python] add .venv as file

7 years agoRemove / from .venv 2256/head
Max [Wed, 1 Feb 2017 16:50:44 +0000 (17:50 +0100)]
Remove / from .venv

7 years agoMerge pull request #2266 from AlekSi/master
Brendan Forster [Tue, 31 Jan 2017 12:27:34 +0000 (13:27 +0100)]
Merge pull request #2266 from AlekSi/master

[Go] Update ignore patterns.

7 years agoMerge pull request #2210 from mcandre/patch-1
Brendan Forster [Tue, 31 Jan 2017 12:26:08 +0000 (13:26 +0100)]
Merge pull request #2210 from mcandre/patch-1

[Node] make directory rules explicit

7 years agoMerge pull request #2267 from taeminhong/unity-vs
Brendan Forster [Tue, 31 Jan 2017 08:14:52 +0000 (09:14 +0100)]
Merge pull request #2267 from taeminhong/unity-vs

Unity: ignore Visual Studio 2015 cache directory

7 years agoUnity: ignore Visual Studio 2015 cache directory 2267/head
Taemin Hong [Tue, 31 Jan 2017 07:19:57 +0000 (16:19 +0900)]
Unity: ignore Visual Studio 2015 cache directory

Since the version 5.2, Unity has used Visual Studio 2015 instead of MonoDevelop as default script editor in Windows.
This change may be helpful for Unity developers who use the recent version of Unity in Windows.

7 years agoAdd plugins for Mac. 2266/head
Alexey Palazhchenko [Mon, 30 Jan 2017 14:48:28 +0000 (17:48 +0300)]
Add plugins for Mac.

7 years agoAdd patterns for plugins.
Alexey Palazhchenko [Mon, 30 Jan 2017 14:42:26 +0000 (17:42 +0300)]
Add patterns for plugins.

7 years agoUpdate Go git ignore patterns.
Alexey Palazhchenko [Mon, 30 Jan 2017 14:09:30 +0000 (17:09 +0300)]
Update Go git ignore patterns.

7 years agoMerge pull request #1917 from seanfisk/seanfisk/waf-updates
Brendan Forster [Sun, 29 Jan 2017 13:04:14 +0000 (14:04 +0100)]
Merge pull request #1917 from seanfisk/seanfisk/waf-updates

Update Waf for URL and specificity

7 years agoMerge pull request #2192 from Arsfiqball/update-laravel-patch-2
Brendan Forster [Sun, 29 Jan 2017 12:31:39 +0000 (13:31 +0100)]
Merge pull request #2192 from Arsfiqball/update-laravel-patch-2

Laravel: ignore homestead config and npm debug.

7 years agoLaravel: ignore npm-debug.log 2192/head
Iqbal Mohammad Abdul Ghoni [Sat, 28 Jan 2017 16:48:56 +0000 (23:48 +0700)]
Laravel: ignore npm-debug.log

7 years agoMerge pull request #2163 from commscheck/xcode-source-control
Brendan Forster [Sat, 28 Jan 2017 11:22:57 +0000 (12:22 +0100)]
Merge pull request #2163 from commscheck/xcode-source-control

Update Objective-C and Swift to match Xcode.gitignore

7 years agoMerge pull request #2262 from OSDevelopment/unrealEngine
Brendan Forster [Sat, 28 Jan 2017 11:11:52 +0000 (12:11 +0100)]
Merge pull request #2262 from OSDevelopment/unrealEngine

Ignore xcworkspace for UnrealEngine Xcode projects

7 years agoMerge pull request #2157 from luiscoms/patch-1
Brendan Forster [Sat, 28 Jan 2017 11:04:37 +0000 (12:04 +0100)]
Merge pull request #2157 from luiscoms/patch-1

Add bower dependency directory

7 years agoMerge pull request #1524 from hcollet/stata
Brendan Forster [Sat, 28 Jan 2017 10:39:46 +0000 (11:39 +0100)]
Merge pull request #1524 from hcollet/stata

First .gitignore for Stata files

7 years agoMerge pull request #2264 from Jumbalaya/patch-1
Brendan Forster [Sat, 28 Jan 2017 10:29:59 +0000 (11:29 +0100)]
Merge pull request #2264 from Jumbalaya/patch-1

Added Simulink .autosave extension

7 years agoMerge pull request #2036 from sammysfo/patch-1
Brendan Forster [Sat, 28 Jan 2017 10:07:44 +0000 (11:07 +0100)]
Merge pull request #2036 from sammysfo/patch-1

Update Perl.gitignore

7 years agoMerge pull request #2049 from cyrodjohn/patch-1
Brendan Forster [Sat, 28 Jan 2017 10:06:19 +0000 (11:06 +0100)]
Merge pull request #2049 from cyrodjohn/patch-1

Update Laravel.gitignore

7 years agoMerge pull request #2221 from brianteeman/patch-1
Brendan Forster [Sat, 28 Jan 2017 09:04:33 +0000 (10:04 +0100)]
Merge pull request #2221 from brianteeman/patch-1

Update Joomla gitignore

7 years agoMerge pull request #2263 from appleboy/patch-3
Brendan Forster [Sat, 28 Jan 2017 08:59:55 +0000 (09:59 +0100)]
Merge pull request #2263 from appleboy/patch-3

ignore public/hot folder for laravel project

7 years agoMerge pull request #2252 from calben/patch-3
Brendan Forster [Sat, 28 Jan 2017 08:59:29 +0000 (09:59 +0100)]
Merge pull request #2252 from calben/patch-3

Add Map Built Data

7 years agoAdded Simulink .autosave extension 2264/head
Jumbalaya [Fri, 27 Jan 2017 16:23:44 +0000 (16:23 +0000)]
Added Simulink .autosave extension

7 years agoignore public/hot folder for laravel project 2263/head
Bo-Yi Wu [Fri, 27 Jan 2017 08:37:26 +0000 (16:37 +0800)]
ignore public/hot folder for laravel project

ref: https://github.com/laravel/laravel/pull/4121

7 years agoIgnore xcworkspace for UnrealEngine Xcode projects 2262/head
Robinson Presotto [Thu, 26 Jan 2017 21:25:00 +0000 (22:25 +0100)]
Ignore xcworkspace for UnrealEngine Xcode projects

7 years agoMerge pull request #2257 from noinkling/patch-1
Brendan Forster [Wed, 25 Jan 2017 13:39:37 +0000 (14:39 +0100)]
Merge pull request #2257 from noinkling/patch-1

Add .env to Node.gitignore

7 years agoAdd .env to Node.gitignore 2257/head
Malcolm [Wed, 25 Jan 2017 03:13:33 +0000 (16:13 +1300)]
Add .env to Node.gitignore

7 years agoAdd .venv as file
Max [Tue, 24 Jan 2017 12:41:24 +0000 (13:41 +0100)]
Add .venv as file

7 years agoMerge pull request #2255 from FabrizioBrancati/master
Brendan Forster [Tue, 24 Jan 2017 11:04:12 +0000 (12:04 +0100)]
Merge pull request #2255 from FabrizioBrancati/master

Updating Swift.gitignore with Package.pins

7 years agoUpdating Swift.gitignore with Package.pins 2255/head
Fabrizio Brancati [Tue, 24 Jan 2017 10:16:40 +0000 (11:16 +0100)]
Updating Swift.gitignore with Package.pins

7 years agoMerge pull request #2247 from msdx/freeline
Brendan Forster [Tue, 24 Jan 2017 08:08:00 +0000 (09:08 +0100)]
Merge pull request #2247 from msdx/freeline

Add freeline rules

7 years agoMerge pull request #2253 from eculver/golang-ignore-glide-cache
Brendan Forster [Tue, 24 Jan 2017 08:02:13 +0000 (09:02 +0100)]
Merge pull request #2253 from eculver/golang-ignore-glide-cache

Ignore project-local Glide cache

7 years agoIgnore project-local Glide cache 2253/head
Evan Culver [Tue, 24 Jan 2017 01:51:10 +0000 (17:51 -0800)]
Ignore project-local Glide cache

7 years agoAdd Map Built Data 2252/head
Calem Bendell [Mon, 23 Jan 2017 21:34:46 +0000 (16:34 -0500)]
Add Map Built Data

Add built data to the gitignore.
Includes data about a map for UE4.14 that is generated when the user builds it (surprise! :D).
Often gigabytes in size.
Definitely don't want it in your repository.

7 years agoAdd freeline rules. 2247/head
msdx [Tue, 17 Jan 2017 05:45:59 +0000 (13:45 +0800)]
Add freeline rules.

7 years agoMerge pull request #2244 from FionaHagen/master
Brendan Forster [Mon, 16 Jan 2017 22:33:00 +0000 (14:33 -0800)]
Merge pull request #2244 from FionaHagen/master

Add Google Services