]> source.dussan.org Git - gitignore.git/log
gitignore.git
10 years agoMerge pull request #909 from Stijn-Flipper/wordpress-fix
Adam Roben [Tue, 7 Jan 2014 03:49:39 +0000 (19:49 -0800)]
Merge pull request #909 from Stijn-Flipper/wordpress-fix

Ignore sensitive data

10 years agoMerge pull request #907 from pimterry/nodeGitignore
Adam Roben [Tue, 7 Jan 2014 03:48:37 +0000 (19:48 -0800)]
Merge pull request #907 from pimterry/nodeGitignore

Ignore grunt and lcov build files in Node projects

10 years agoMerge pull request #906 from arinto/new-ignore-for-Eclipse-SBT
Adam Roben [Tue, 7 Jan 2014 03:47:23 +0000 (19:47 -0800)]
Merge pull request #906 from arinto/new-ignore-for-Eclipse-SBT

Add output directory of sbteclipse plugin, which is ".target" directory.

10 years agoMerge pull request #905 from arinto/new-ignore-in-play-2.2.x
Adam Roben [Tue, 7 Jan 2014 03:46:04 +0000 (19:46 -0800)]
Merge pull request #905 from arinto/new-ignore-in-play-2.2.x

Add "dist" and ".cache" folders for Play 2.2.x

10 years agoMerge pull request #899 from andrewwutw/master
Adam Roben [Tue, 7 Jan 2014 03:36:27 +0000 (19:36 -0800)]
Merge pull request #899 from andrewwutw/master

Added SCons.gitignore

10 years agoMerge pull request #893 from dng-dev/patch-1
Adam Roben [Tue, 7 Jan 2014 03:35:03 +0000 (19:35 -0800)]
Merge pull request #893 from dng-dev/patch-1

Update to Magento 1.8.x

10 years agoMerge pull request #883 from richorama/master
Adam Roben [Tue, 7 Jan 2014 03:13:47 +0000 (19:13 -0800)]
Merge pull request #883 from richorama/master

added node_modules

10 years agoMerge pull request #840 from jan0sch/SugarCRM
Adam Roben [Tue, 7 Jan 2014 03:12:22 +0000 (19:12 -0800)]
Merge pull request #840 from jan0sch/SugarCRM

Added the new upload directories and ignore the cache directory completely

10 years agoalso ignore sensitive configuration data 909/head
Stijn-Flipper [Sat, 28 Dec 2013 16:16:38 +0000 (17:16 +0100)]
also ignore sensitive configuration data

10 years agoIgnore grunt and lcov build files in Node projects 907/head
Tim Perry [Thu, 26 Dec 2013 23:53:21 +0000 (23:53 +0000)]
Ignore grunt and lcov build files in Node projects

10 years agoAdd output directory of sbteclipse plugin, 906/head
Arinto Murdopo [Tue, 24 Dec 2013 23:48:34 +0000 (07:48 +0800)]
Add output directory of sbteclipse plugin,
which is ".target" directory.

10 years agoAdd "dist" and ".cache" folders for Play 2.2.x 905/head
Arinto Murdopo [Tue, 24 Dec 2013 23:35:59 +0000 (07:35 +0800)]
Add "dist" and ".cache" folders for Play 2.2.x
Link: http://www.playframework.com/documentation/2.2.x/Anatomy
10 years agoAdded SCons.gitignore 899/head
andrewwutw [Tue, 17 Dec 2013 07:06:57 +0000 (15:06 +0800)]
Added SCons.gitignore

10 years agoMerge pull request #896 from github/ignore-rails-config-secret
Markus Olsson [Mon, 16 Dec 2013 13:18:52 +0000 (05:18 -0800)]
Merge pull request #896 from github/ignore-rails-config-secret

Rails: Ignore config/secrets.yml

10 years agoMerge pull request #891 from hulet/duplicate-fix
Markus Olsson [Mon, 16 Dec 2013 13:15:39 +0000 (05:15 -0800)]
Merge pull request #891 from hulet/duplicate-fix

Remove duplicate rule

10 years agosecrets.yml, not secret. 896/head
Shawn Davenport [Sat, 14 Dec 2013 18:58:17 +0000 (12:58 -0600)]
secrets.yml, not secret.

10 years agoRails: Ignore the new home of secret_key_base.
Shawn Davenport [Sat, 14 Dec 2013 18:55:32 +0000 (12:55 -0600)]
Rails: Ignore the new home of secret_key_base.

10 years agoUpdate to Magento 1.8.x 893/head
Daniel Niedergesäß [Thu, 12 Dec 2013 15:10:56 +0000 (16:10 +0100)]
Update to Magento 1.8.x

10 years agoRemove duplicate rule 891/head
Steve Hulet [Tue, 10 Dec 2013 05:21:57 +0000 (21:21 -0800)]
Remove duplicate rule

10 years agoadded node_modules 883/head
Richard Astbury [Fri, 29 Nov 2013 20:22:42 +0000 (20:22 +0000)]
added node_modules

11 years agoMerge pull request #785 from NickHodges/master
Adam Roben [Wed, 27 Nov 2013 20:10:58 +0000 (12:10 -0800)]
Merge pull request #785 from NickHodges/master

Update Delphi to include new extensions

11 years agoMerging upstream 785/head
Nick Hodges [Wed, 27 Nov 2013 20:03:08 +0000 (15:03 -0500)]
Merging upstream

11 years agoExplanations for ignoring the cache directory 840/head
Jens Jahnke [Wed, 27 Nov 2013 16:30:57 +0000 (17:30 +0100)]
Explanations for ignoring the cache directory

I wrote a more explanatory comment regarding the cache directory
and why it is ignored.

11 years agoMerge pull request #879 from phmarek/master
Adam Roben [Wed, 27 Nov 2013 14:52:32 +0000 (06:52 -0800)]
Merge pull request #879 from phmarek/master

Added file for Common Lisp.

11 years agoMerge pull request #878 from minsOne/master
Adam Roben [Wed, 27 Nov 2013 14:50:06 +0000 (06:50 -0800)]
Merge pull request #878 from minsOne/master

Added ipa file to Objective-C.gitignore

11 years agoMerge pull request #788 from sjwoodr/master
Adam Roben [Wed, 27 Nov 2013 14:44:12 +0000 (06:44 -0800)]
Merge pull request #788 from sjwoodr/master

Update Java to exclude J2ME Mobile Tools for Java

11 years agoJava ME update for .mtj.tmp 788/head
Steve Woodruff [Wed, 27 Nov 2013 14:30:56 +0000 (09:30 -0500)]
Java ME update for .mtj.tmp

11 years agoAdded file for Common Lisp. 863/head 879/head
Philipp Marek [Wed, 20 Nov 2013 08:21:26 +0000 (09:21 +0100)]
Added file for Common Lisp.

11 years agoAdded ipa file to Objective-C.gitignore 878/head
minsOne [Wed, 27 Nov 2013 05:40:07 +0000 (14:40 +0900)]
Added ipa file to Objective-C.gitignore

11 years agoMerge pull request #876 from jmillerdesign/patch-2
Adam Roben [Wed, 27 Nov 2013 04:42:46 +0000 (20:42 -0800)]
Merge pull request #876 from jmillerdesign/patch-2

Use absolute paths to the files to ignore

11 years agoUse absolute paths to the files to ignore 876/head
J. Miller [Wed, 27 Nov 2013 04:37:48 +0000 (20:37 -0800)]
Use absolute paths to the files to ignore

This fixes an issue where index.php within a theme directory would be ignored, when the intention was to just ignore the index.php file in the root.

11 years agoMerge pull request #875 from four04/add-common-linux-compile-file-extensions
Adam Roben [Wed, 27 Nov 2013 04:09:39 +0000 (20:09 -0800)]
Merge pull request #875 from four04/add-common-linux-compile-file-extensions

C: Ignore Some Common File Extensions for Binaries on Linux

11 years agoMerge pull request #871 from mattrubin/master
Adam Roben [Wed, 27 Nov 2013 04:06:26 +0000 (20:06 -0800)]
Merge pull request #871 from mattrubin/master

Remove duplicate line in Objective-C.gitignore

11 years agoMerge pull request #869 from j4y/master
Adam Roben [Wed, 27 Nov 2013 04:05:01 +0000 (20:05 -0800)]
Merge pull request #869 from j4y/master

plugin.xml shouldn't be in source control.  This is a Grails plugin artifact

11 years agoMerge pull request #870 from CaseyB/master
Adam Roben [Wed, 27 Nov 2013 04:02:55 +0000 (20:02 -0800)]
Merge pull request #870 from CaseyB/master

Ignore MonoDevelop cache files

11 years agoMerge pull request #866 from stefan-vatov/master
Adam Roben [Wed, 27 Nov 2013 04:00:05 +0000 (20:00 -0800)]
Merge pull request #866 from stefan-vatov/master

Added .gitignore for Scrivener

11 years agoMerge branch 'master' into add-common-linux-compile-file-extensions 875/head
Kristofer Rye [Wed, 27 Nov 2013 03:59:01 +0000 (22:59 -0500)]
Merge branch 'master' into add-common-linux-compile-file-extensions

11 years agoMerge pull request #864 from oschrenk/patch-4
Adam Roben [Wed, 27 Nov 2013 03:57:49 +0000 (19:57 -0800)]
Merge pull request #864 from oschrenk/patch-4

Ignore worksheet directory

11 years agoMerge branch 'master' into add-common-linux-compile-file-extensions
Kristofer Rye [Wed, 27 Nov 2013 03:57:22 +0000 (22:57 -0500)]
Merge branch 'master' into add-common-linux-compile-file-extensions

More updates

11 years agoMerge pull request #862 from jaseemabid/emacs
Adam Roben [Wed, 27 Nov 2013 03:56:16 +0000 (19:56 -0800)]
Merge pull request #862 from jaseemabid/emacs

Ignore elpa and eshell generated files

11 years agoMerge pull request #861 from jaseemabid/elisp
Adam Roben [Wed, 27 Nov 2013 03:55:57 +0000 (19:55 -0800)]
Merge pull request #861 from jaseemabid/elisp

Ignore file for elisp projects

11 years agoMerge branch 'master' into add-common-linux-compile-file-extensions
Kristofer Rye [Wed, 27 Nov 2013 03:55:19 +0000 (22:55 -0500)]
Merge branch 'master' into add-common-linux-compile-file-extensions

More upstream merges

11 years agoMerge pull request #856 from oschrenk/patch-3
Adam Roben [Wed, 27 Nov 2013 03:51:32 +0000 (19:51 -0800)]
Merge pull request #856 from oschrenk/patch-3

Ignore files created by maven-release-plugin

11 years agoMerge pull request #853 from danieljabailey/master
Adam Roben [Wed, 27 Nov 2013 03:50:24 +0000 (19:50 -0800)]
Merge pull request #853 from danieljabailey/master

Add Lazarus IDE ignore file (in global dir this time)

11 years agoMerge pull request #852 from kdeldycke/patch-1
Adam Roben [Wed, 27 Nov 2013 03:50:06 +0000 (19:50 -0800)]
Merge pull request #852 from kdeldycke/patch-1

Ignore rope files.

11 years agoMerge pull request #851 from rsolomo/patch-1
Adam Roben [Wed, 27 Nov 2013 03:49:04 +0000 (19:49 -0800)]
Merge pull request #851 from rsolomo/patch-1

add 'build' to Node.gitignore

11 years agoMerge pull request #850 from Jiri-Kremser/master
Adam Roben [Wed, 27 Nov 2013 03:48:40 +0000 (19:48 -0800)]
Merge pull request #850 from Jiri-Kremser/master

Adding 4 directories generated by GWT compiler.

11 years agoMerge pull request #849 from Danimoth/patch-1
Adam Roben [Wed, 27 Nov 2013 03:48:19 +0000 (19:48 -0800)]
Merge pull request #849 from Danimoth/patch-1

Change Eclipse.gitignore to correctly handle bin/ and tmp/ directories

11 years agoMerge branch 'master' into add-common-linux-compile-file-extensions
Kristofer Rye [Wed, 27 Nov 2013 03:42:07 +0000 (22:42 -0500)]
Merge branch 'master' into add-common-linux-compile-file-extensions

Upstream merges

11 years agoMerge pull request #536 from troii/gradle
Adam Roben [Wed, 27 Nov 2013 03:38:45 +0000 (19:38 -0800)]
Merge pull request #536 from troii/gradle

Gradle build system ignore

11 years agoMerge pull request #835 from ggirou/master
Adam Roben [Wed, 27 Nov 2013 03:37:23 +0000 (19:37 -0800)]
Merge pull request #835 from ggirou/master

Move editor specific files into a new DartEditor.gitignore

11 years agoMerge branch 'master' into add-common-linux-compile-file-extensions
Kristofer Rye [Wed, 27 Nov 2013 03:32:38 +0000 (22:32 -0500)]
Merge branch 'master' into add-common-linux-compile-file-extensions

I messed this up partially.

11 years agoMerge pull request #728 from zyrx/master
Adam Roben [Wed, 27 Nov 2013 03:32:13 +0000 (19:32 -0800)]
Merge pull request #728 from zyrx/master

DW Dreamweaver added files

11 years agoMerge branch 'master' of git://github.com/github/gitignore into add-common-linux...
Kristofer Rye [Wed, 27 Nov 2013 03:31:25 +0000 (22:31 -0500)]
Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions

Conflicts:
C.gitignore

Updates done.

11 years agoMerge pull request #817 from jimmyandrade/patch-1
Adam Roben [Wed, 27 Nov 2013 03:27:03 +0000 (19:27 -0800)]
Merge pull request #817 from jimmyandrade/patch-1

Update Joomla.gitignore to ignore J2.5 files

11 years agoMerge pull request #812 from sableloki/patch-for-yeoman
Adam Roben [Wed, 27 Nov 2013 03:25:49 +0000 (19:25 -0800)]
Merge pull request #812 from sableloki/patch-for-yeoman

Template for Yeoman Projects

11 years agoMerge pull request #800 from johnkharvey/stella
Adam Roben [Wed, 27 Nov 2013 03:25:22 +0000 (19:25 -0800)]
Merge pull request #800 from johnkharvey/stella

Add file for Atari 2600 / Atari 7800 assemblers

11 years agoMerge pull request #806 from torokmark/master
Adam Roben [Wed, 27 Nov 2013 03:24:26 +0000 (19:24 -0800)]
Merge pull request #806 from torokmark/master

Added: ignore Ada object and ali files

11 years agoMerge pull request #789 from Lance0312/archlinuxpkg
Adam Roben [Wed, 27 Nov 2013 03:19:49 +0000 (19:19 -0800)]
Merge pull request #789 from Lance0312/archlinuxpkg

Add .gitignore for Arch Linux Packages

11 years agoMerge pull request #777 from fivef/master
Adam Roben [Wed, 27 Nov 2013 03:13:43 +0000 (19:13 -0800)]
Merge pull request #777 from fivef/master

Create ROS.gitignore

11 years agoMerge pull request #726 from jtimberman/chef-cookbook
Adam Roben [Wed, 27 Nov 2013 02:16:18 +0000 (18:16 -0800)]
Merge pull request #726 from jtimberman/chef-cookbook

Add ignore file for Chef cookbooks

11 years agoRemove duplicate line in Objective-C.gitignore 871/head
Matt Rubin [Mon, 25 Nov 2013 06:58:42 +0000 (01:58 -0500)]
Remove duplicate line in Objective-C.gitignore

The pattern `*.xccheckout` is already ignored on line 15.

11 years agoIgnore MonoDevelop cache files 870/head
Borders, Casey [Fri, 22 Nov 2013 19:00:06 +0000 (14:00 -0500)]
Ignore MonoDevelop cache files

11 years agoplugin.xml shouldn't be in source control 869/head
Jay Prall [Fri, 22 Nov 2013 00:55:11 +0000 (19:55 -0500)]
plugin.xml shouldn't be in source control

11 years agoIgnore worksheet directory 864/head
Oliver Schrenk [Wed, 20 Nov 2013 19:13:07 +0000 (20:13 +0100)]
Ignore worksheet directory

Since Scala IDE V3.0 has worksheets which are like a REPL session on steroids. For the worksheet to function `*.scala` files get created in a hidden `.worksheet` directory. As these are auto-generated the directory should be ignored.

11 years agoIgnore file for elisp projects 861/head
Jaseem Abid [Tue, 19 Nov 2013 11:56:22 +0000 (17:26 +0530)]
Ignore file for elisp projects

- Ignore compiled files

11 years agoIgnore files created by maven-release-plugin 856/head
Oliver Schrenk [Fri, 15 Nov 2013 19:10:11 +0000 (20:10 +0100)]
Ignore files created by maven-release-plugin

Maven Release Plugin provides a standard mechanism to release project
artifacts.

During the various phases of the execution the plugin create various
files, especially if you do a dry run that allows you to see the changes
that the plugin will perform on your pom files

mvn release:prepare -D dryRun=true

It will create

- `release.properties` - copy of the properties to be used
- `pom.xml.releaseBackup` - the pom.xml prior to any changes
- `pom.xml.tag` - the pom.xml as it will look when tagged
- `pom.xml.next` - the pom.xml as it will look for the next iteration

11 years agoIgnore elpa and eshell generated files 862/head
Jaseem Abid [Thu, 14 Nov 2013 05:30:49 +0000 (11:00 +0530)]
Ignore elpa and eshell generated files

11 years agoMerge pull request #760 854/head
Justin Spahr-Summers [Wed, 13 Nov 2013 22:19:22 +0000 (14:19 -0800)]
Merge pull request #760

11 years agoRemove generic and Java ignore patterns
Justin Spahr-Summers [Wed, 13 Nov 2013 22:19:16 +0000 (14:19 -0800)]
Remove generic and Java ignore patterns

Those belong in other ignore files.

11 years agoMoved file to Global 760/head
unknown [Wed, 13 Nov 2013 20:19:36 +0000 (15:19 -0500)]
Moved file to Global

11 years agoAdded lazarus ignore file in the global dir this time 853/head
Daniel Bailey [Wed, 13 Nov 2013 18:33:14 +0000 (18:33 +0000)]
Added lazarus ignore file in the global dir this time

11 years agoMerge branch 'master' of https://github.com/github/gitignore
Daniel Bailey [Wed, 13 Nov 2013 18:32:11 +0000 (18:32 +0000)]
Merge branch 'master' of https://github.com/github/gitignore

11 years agoIgnore rope files. 852/head
Kevin Deldycke [Wed, 13 Nov 2013 13:32:07 +0000 (14:32 +0100)]
Ignore rope files.

Rope (https://bitbucket.org/zjes/rope_py3k/overview) is a refactoring tool for Python. It creates temporary files in `.ropeproject` to cache data. These files should be ignored by default.

11 years agoadd 'build' to Node.gitignore 851/head
Ray Solomon [Wed, 13 Nov 2013 09:27:28 +0000 (01:27 -0800)]
add 'build' to Node.gitignore

This is to exclude compiled code from nodejs addons.
Reference: http://nodejs.org/api/addons.html

11 years agoMerge pull request #755 from ohmanger/patch-1
Justin Spahr-Summers [Wed, 13 Nov 2013 04:46:50 +0000 (20:46 -0800)]
Merge pull request #755 from ohmanger/patch-1

Ignore local.xml as this contains database credentials.

11 years agoMerge pull request #738 from Blaisorblade/patch-1
Justin Spahr-Summers [Wed, 13 Nov 2013 04:45:47 +0000 (20:45 -0800)]
Merge pull request #738 from Blaisorblade/patch-1

Create Agda.gitignore

11 years agoMerge pull request #725 from shivam5992/patch-1
Justin Spahr-Summers [Wed, 13 Nov 2013 04:42:35 +0000 (20:42 -0800)]
Merge pull request #725 from shivam5992/patch-1

Deployed file ignore

11 years agoAdding ".gwt/", "gwt-unitCache/", "www-test" and ".gwt-tmp/" to .gitignore 850/head
Jirka Kremser [Thu, 14 Mar 2013 22:26:39 +0000 (23:26 +0100)]
Adding ".gwt/", "gwt-unitCache/", "www-test" and ".gwt-tmp/" to .gitignore

11 years agoUpdate Eclipse.gitignore 849/head
Alexander Karatarakis [Wed, 13 Nov 2013 01:14:12 +0000 (03:14 +0200)]
Update Eclipse.gitignore

11 years agoMerge pull request #663 from abergs/patch-1
Markus Olsson [Tue, 12 Nov 2013 20:26:32 +0000 (12:26 -0800)]
Merge pull request #663 from abergs/patch-1

Visual Studio: Ignore Chutzpah testrunnerfiles

11 years agoMerge pull request #682 from fsw/master
Justin Spahr-Summers [Tue, 12 Nov 2013 18:40:46 +0000 (10:40 -0800)]
Merge pull request #682 from fsw/master

ignoring *.autosave files generated by QtCreator

11 years agoMerge pull request #657 from MrBogomips/master
Justin Spahr-Summers [Tue, 12 Nov 2013 18:37:21 +0000 (10:37 -0800)]
Merge pull request #657 from MrBogomips/master

PlayFramework: exclude assets under the bin/ directory generated by the compiler

11 years agoMerge pull request #655 from conradolega/master
Justin Spahr-Summers [Tue, 12 Nov 2013 18:36:59 +0000 (10:36 -0800)]
Merge pull request #655 from conradolega/master

.gitignore for Meteor (and Meteorite)

11 years agoMerge pull request #845 from gillesdemey/patch-1
Adam Roben [Tue, 12 Nov 2013 18:21:15 +0000 (10:21 -0800)]
Merge pull request #845 from gillesdemey/patch-1

Update VisualStudio.gitignore

11 years agoUpdate VisualStudio.gitignore 845/head
Gilles De Mey [Tue, 12 Nov 2013 18:08:25 +0000 (19:08 +0100)]
Update VisualStudio.gitignore

I have no idea what this is doing here, totally unrelated to Visual Studio. There is a special OSX gitignore file that you can use.

11 years agoMerge pull request #843 from vikraman/patch-1
Adam Roben [Tue, 12 Nov 2013 17:20:40 +0000 (09:20 -0800)]
Merge pull request #843 from vikraman/patch-1

Ignore files generated by cabal sandbox

11 years agoIgnore files generated by cabal sandbox 843/head
Vikraman Choudhury [Wed, 18 Sep 2013 17:58:11 +0000 (23:28 +0530)]
Ignore files generated by cabal sandbox

https://github.com/haskell/cabal/wiki/Package-Environments#sandbox-command

11 years agoMerge pull request #844 from llonchj/python
Adam Roben [Tue, 12 Nov 2013 17:17:59 +0000 (09:17 -0800)]
Merge pull request #844 from llonchj/python

Added Sphinx documentation

11 years agoAdded Sphinx documentation 844/head
Jordi Llonch [Tue, 12 Nov 2013 17:13:14 +0000 (04:13 +1100)]
Added Sphinx documentation

11 years agoMerge pull request #842 from borntyping/patch-1
Adam Roben [Tue, 12 Nov 2013 16:25:57 +0000 (08:25 -0800)]
Merge pull request #842 from borntyping/patch-1

Add .cache to the Python .gitignore

11 years agoAdd .cache to the Python .gitignore 842/head
Sam Clements [Mon, 5 Aug 2013 22:17:52 +0000 (23:17 +0100)]
Add .cache to the Python .gitignore

`.cache` is generated when unittests are run with py.test

11 years agoMerge pull request #730 from Lazersmoke/patch-1
Adam Roben [Tue, 12 Nov 2013 16:11:17 +0000 (08:11 -0800)]
Merge pull request #730 from Lazersmoke/patch-1

Added Kate ignore file in Global folder

11 years agoMerge pull request #683 from jkodumal/patch-1
Adam Roben [Tue, 12 Nov 2013 16:09:39 +0000 (08:09 -0800)]
Merge pull request #683 from jkodumal/patch-1

Add .hsenv to .gitignore

11 years agoMerge pull request #681 from filipelenfers/master
Adam Roben [Tue, 12 Nov 2013 16:07:58 +0000 (08:07 -0800)]
Merge pull request #681 from filipelenfers/master

Ensime ignores

11 years agoMerge pull request #645 from pxqr/master
Adam Roben [Tue, 12 Nov 2013 16:04:57 +0000 (08:04 -0800)]
Merge pull request #645 from pxqr/master

Ignore emacs flymake-mode temp files.

11 years agoMerge pull request #563 from fibo/master
Adam Roben [Tue, 12 Nov 2013 16:03:03 +0000 (08:03 -0800)]
Merge pull request #563 from fibo/master

.gitignore for VVVV

11 years agoMerge pull request #626 from borneq/patch-1
Adam Roben [Tue, 12 Nov 2013 16:00:33 +0000 (08:00 -0800)]
Merge pull request #626 from borneq/patch-1

*.~* instead *.~*~ for backup files

11 years agoMerge pull request #624 from finnjohnsen/patch-1
Adam Roben [Tue, 12 Nov 2013 15:59:57 +0000 (07:59 -0800)]
Merge pull request #624 from finnjohnsen/patch-1

removed implicit ignore

11 years agoMerge pull request #569 from AlainFolletete/master
Adam Roben [Tue, 12 Nov 2013 15:57:14 +0000 (07:57 -0800)]
Merge pull request #569 from AlainFolletete/master

Add GitIgnore file for Prestashop Software