]> source.dussan.org Git - gitignore.git/log
gitignore.git
11 years agoadd .xccheckout to Objective-C gitignore 774/head
Bart [Tue, 17 Sep 2013 10:42:12 +0000 (12:42 +0200)]
add .xccheckout to Objective-C gitignore

This is a file that Xcode 5 uses for version control, doesn't need to be checked in. Also see http://stackoverflow.com/a/18448100/1877078

11 years agoMerge pull request #735 from aldo-roman/patch-1
Charlie Somerville [Mon, 26 Aug 2013 10:41:59 +0000 (03:41 -0700)]
Merge pull request #735 from aldo-roman/patch-1

added secret_token.rb

11 years agoMerge pull request #714 from mattjeffery/ignore_kernel_objects
Charlie Somerville [Mon, 26 Aug 2013 07:12:36 +0000 (00:12 -0700)]
Merge pull request #714 from mattjeffery/ignore_kernel_objects

Ignore kernel object files

11 years agoadded secret_token.rb 735/head
Aldo Román Nureña [Mon, 12 Aug 2013 17:40:19 +0000 (12:40 -0500)]
added secret_token.rb

I added secret_token.rb file to the gitignore as there are public repos sharing it.

11 years agoignore kernel object files 714/head
Matt Jeffery [Fri, 19 Jul 2013 17:05:04 +0000 (18:05 +0100)]
ignore kernel object files

11 years agoMerge pull request #576 from nysa/master
Justin Spahr-Summers [Wed, 3 Jul 2013 15:45:13 +0000 (08:45 -0700)]
Merge pull request #576 from nysa/master

Ignore Vim untitled and unsaved buffer swapfiles

11 years agoMerge pull request #493 from strugee/master
Justin Spahr-Summers [Wed, 3 Jul 2013 15:39:56 +0000 (08:39 -0700)]
Merge pull request #493 from strugee/master

This repository didn't have a CONTRIBUTING.md file. Now it does.

11 years agoRemove Podfile.lock from Objective-C ignores
Justin Spahr-Summers [Wed, 3 Jul 2013 15:28:28 +0000 (08:28 -0700)]
Remove Podfile.lock from Objective-C ignores

Per discussion in #148.

11 years agoMerge remote-tracking branch 'matzew/master' (pull request #418)
Justin Spahr-Summers [Tue, 2 Jul 2013 20:09:57 +0000 (13:09 -0700)]
Merge remote-tracking branch 'matzew/master' (pull request #418)

11 years agoAdding CocoaPods to gitignore
Matthias Wessendorf [Tue, 2 Jul 2013 19:25:38 +0000 (21:25 +0200)]
Adding CocoaPods to gitignore

11 years agoMerge pull request #694 from anurse/patch-1
Paul Betts [Sat, 29 Jun 2013 00:09:29 +0000 (17:09 -0700)]
Merge pull request #694 from anurse/patch-1

Unignore "packages/*/build" in VisualStudio.gitignore.

11 years agoUnignore "packages/*/build" in VisualStudio.gitignore. 694/head
Andrew Nurse [Fri, 28 Jun 2013 23:44:00 +0000 (16:44 -0700)]
Unignore "packages/*/build" in VisualStudio.gitignore.

11 years agoUpdate LICENSE
Ted Nyman [Sun, 26 May 2013 05:56:08 +0000 (23:56 -0600)]
Update LICENSE

11 years agoIgnore Vim untitled and unsaved buffer swapfiles 576/head
Nysa [Wed, 6 Mar 2013 17:02:36 +0000 (11:02 -0600)]
Ignore Vim untitled and unsaved buffer swapfiles

Vim creates buffer swapfiles starting at .swp for buffers that are
active but untitled and unsaved.

11 years agoMerge pull request #523 from shanselman/patch-1
Phil Haack [Thu, 24 Jan 2013 20:40:18 +0000 (12:40 -0800)]
Merge pull request #523 from shanselman/patch-1

Updated to exclude *.publishsettings

11 years agoUpdated to exclude *.publishsettings 523/head
Scott Hanselman [Thu, 24 Jan 2013 20:24:17 +0000 (12:24 -0800)]
Updated to exclude *.publishsettings

Updated to exclude *.publishsettings

11 years agoMerge pull request #507 from 0xAX/master
Alan Rogers [Tue, 22 Jan 2013 21:42:45 +0000 (13:42 -0800)]
Merge pull request #507 from 0xAX/master

Erlang.gitignore erlang.crash.dump added

11 years agoMerge pull request #474 from zhaojunmeng/master
Justin Spahr-Summers [Tue, 22 Jan 2013 21:39:30 +0000 (13:39 -0800)]
Merge pull request #474 from zhaojunmeng/master

Add *~ to ignore vim temp file.

11 years agoMerge pull request #508 from alloy/master
Justin Spahr-Summers [Tue, 22 Jan 2013 21:37:59 +0000 (13:37 -0800)]
Merge pull request #508 from alloy/master

[Objective-C] No longer ignore `xcworkspace` documents.

11 years agoMerge pull request #519 from Haacked/visualstudio-teamcity
Phil Haack [Tue, 22 Jan 2013 21:25:08 +0000 (13:25 -0800)]
Merge pull request #519 from Haacked/visualstudio-teamcity

VisualStudio: Add TeamCity exclusion

11 years agoVisualStudio: Add TeamCity exclusion 519/head
Snakiej [Fri, 19 Oct 2012 12:32:36 +0000 (15:32 +0300)]
VisualStudio: Add TeamCity exclusion

Exclude folders created by the TeamCity VS plugin.

11 years agoMerge pull request #514 from bristol/vim-swapfile-fix
Matt Burke [Tue, 22 Jan 2013 20:08:37 +0000 (12:08 -0800)]
Merge pull request #514 from bristol/vim-swapfile-fix

Changed line matching vim swapfiles to use all names it will create

11 years agoMerge pull request #518 from Haacked/more-pr-consolidation
Phil Haack [Tue, 22 Jan 2013 20:01:26 +0000 (12:01 -0800)]
Merge pull request #518 from Haacked/more-pr-consolidation

More pr consolidation

11 years agoMerge pull request #517 from steveoh/patch-1
Phil Haack [Tue, 22 Jan 2013 20:00:24 +0000 (12:00 -0800)]
Merge pull request #517 from steveoh/patch-1

Update VisualStudio.gitignore for vs 2012 web deploy setting.

11 years agoUpdate Global/VisualStudio.gitignore 518/head
Matt Cooper [Mon, 10 Sep 2012 13:49:43 +0000 (06:49 -0700)]
Update Global/VisualStudio.gitignore

Visual Studio 2010 Express for Windows Phone seems to generate .cachefile files.

11 years agoRemove inclusion of repositories.config
Haacked [Tue, 22 Jan 2013 19:51:46 +0000 (11:51 -0800)]
Remove inclusion of repositories.config

If you use package restore, you actually don't want this file
included. It's not needed. It's only needed if you version
packages. AKA, you only need this file if you are not ignoring
the "packages" folder.

11 years agoMerge pull request #516 from Haacked/dotnet-gitignore-pr-consolidation
Phil Haack [Tue, 22 Jan 2013 19:40:59 +0000 (11:40 -0800)]
Merge pull request #516 from Haacked/dotnet-gitignore-pr-consolidation

Dotnet gitignore pr consolidation

11 years agoVisualStudio: ignore .dotcover files. 516/head
Paul Stack [Thu, 19 Apr 2012 09:17:30 +0000 (11:17 +0200)]
VisualStudio: ignore .dotcover files.

11 years agoVisualStudio: Include the packages/repositories.config file.
Kristian Hellang [Wed, 15 Aug 2012 07:54:17 +0000 (10:54 +0300)]
VisualStudio: Include the packages/repositories.config file.

I agree to ignore the NuGet packages folder, but I really think you should check in the repositories.config so NuGet PackageRestore can do it's magic when someone pulls the code and tries to build it...

11 years agoVisualStudio: Ignore vi's *~ temp files
Andrew Arnott [Sat, 11 Aug 2012 22:33:32 +0000 (15:33 -0700)]
VisualStudio: Ignore vi's *~ temp files

11 years agoVisualStudio: Remove dupes, add trailing slashes, etc.
neogic [Tue, 11 Dec 2012 02:28:04 +0000 (02:28 +0000)]
VisualStudio: Remove dupes, add trailing slashes, etc.

Add trailing slashes to folders, RS rule comment, remove dupes.

11 years agoVisualStudio: Ignore *.tmp_proj
sgm [Wed, 9 Jan 2013 12:35:20 +0000 (21:35 +0900)]
VisualStudio: Ignore *.tmp_proj

This might be created temporarily during a build.

11 years agoVisualStudio: Ignore update log HTML file
Bernhard Döbler [Sat, 19 Jan 2013 16:25:10 +0000 (17:25 +0100)]
VisualStudio: Ignore update log HTML file

VS2012 creates UpdateLog2.htm - not needed in git repository

11 years agoUpdate VisualStudio.gitignore 517/head
steve [Tue, 22 Jan 2013 19:33:24 +0000 (12:33 -0700)]
Update VisualStudio.gitignore

New web deploy file name? vs 2012 added this to my solution and it shouldn't go to an open repo.

11 years agoMerge pull request #492 from Haacked/consolidate-dotnet-settings
Phil Haack [Tue, 22 Jan 2013 18:36:18 +0000 (10:36 -0800)]
Merge pull request #492 from Haacked/consolidate-dotnet-settings

Consolidate CSharp and VB.NET gitignore files into VisualStudio one.

11 years agoIgnore crap from Macs 492/head
Phil Haack [Tue, 22 Jan 2013 18:35:42 +0000 (10:35 -0800)]
Ignore crap from Macs

Cross platform .NET Dev FTW!

11 years agoIgnore .pfx files such as Windows Store Key
Phil Haack [Tue, 22 Jan 2013 18:30:18 +0000 (10:30 -0800)]
Ignore .pfx files such as Windows Store Key

11 years agoChanged line matching vim swapfiles to use all names it will create as described... 514/head
andy bristol [Tue, 22 Jan 2013 01:10:16 +0000 (20:10 -0500)]
Changed line matching vim swapfiles to use all names it will create as described in http://vimdoc.sourceforge.net/htmldoc/recover.html#E326

11 years agoMerge pull request #329 from svkampen/patch-1
Daniel Hengeveld [Mon, 21 Jan 2013 05:15:08 +0000 (21:15 -0800)]
Merge pull request #329 from svkampen/patch-1

Added __pycache__

11 years agoMerge pull request #445 from bungeshea/WordPress
Daniel Hengeveld [Mon, 21 Jan 2013 03:12:08 +0000 (19:12 -0800)]
Merge pull request #445 from bungeshea/WordPress

Rename Wordpress.gitignore to WordPress.gitignore

11 years agoRenamed Wordpress.gitignore to WordPress.gitignore 445/head
Shea Bunge [Sat, 19 Jan 2013 06:03:36 +0000 (17:03 +1100)]
Renamed Wordpress.gitignore to WordPress.gitignore
WordPress should *always* have a capital P!

11 years agoRemoved Wordpress.gitignore for renaming
Shea Bunge [Sat, 19 Jan 2013 06:03:03 +0000 (17:03 +1100)]
Removed Wordpress.gitignore for renaming

11 years ago[Objective-C] No longer ignore `xcworkspace` documents. 508/head
Eloy Durán [Tue, 15 Jan 2013 10:33:57 +0000 (11:33 +0100)]
[Objective-C] No longer ignore `xcworkspace` documents.

Workspaces are real documents that can be opened, just like `xcodeproj`
documents. These documents are also generated/used by CocoaPods to
configure a project’s dependencies. For these reasons, there does not
seem a good reason to ignore these any longer.

11 years agoErlang.gitignore erlang.crash.dump added 507/head
0xAX [Mon, 14 Jan 2013 09:01:00 +0000 (15:01 +0600)]
Erlang.gitignore erlang.crash.dump added

11 years agoRemoved comment. 329/head
Sam van Kampen [Sun, 13 Jan 2013 16:41:18 +0000 (17:41 +0100)]
Removed comment.

11 years agoadd a CONTRIBUTING.md file 493/head
Alex Jordan [Sun, 23 Dec 2012 06:49:43 +0000 (22:49 -0800)]
add a CONTRIBUTING.md file

add a CONTRIBUTING.md file, copied verbatim from the "Pull Requests" section in README.md

11 years agoRemove CSharp and VB.NET ignore files
Haacked [Wed, 19 Dec 2012 23:49:20 +0000 (15:49 -0800)]
Remove CSharp and VB.NET ignore files

These files were redundant. They had almost exactly the same
settings. They are being replaced by the VisualStudio file.

11 years agoMerge missing CSharp/VB settinsg into VisualStudio
Haacked [Wed, 19 Dec 2012 23:46:33 +0000 (15:46 -0800)]
Merge missing CSharp/VB settinsg into VisualStudio

The VisualStudio gitignore file was missing a few useful
settings contained in the CSharp and VB.NET gitignore files.

11 years agoMove VisualStudio file from Global to main list
Haacked [Wed, 19 Dec 2012 23:28:41 +0000 (15:28 -0800)]
Move VisualStudio file from Global to main list

11 years agoMerge pull request #301 from jshou/patch-1
Daniel Hengeveld [Wed, 19 Dec 2012 22:58:58 +0000 (14:58 -0800)]
Merge pull request #301 from jshou/patch-1

* patch-1:
  add intellij files to Android.gitignore

11 years agoadd intellij files to Android.gitignore
Joshua Hou [Thu, 19 Apr 2012 01:42:13 +0000 (18:42 -0700)]
add intellij files to Android.gitignore

11 years agoMerge pull request #456 from jan0sch/master
Daniel Hengeveld [Wed, 19 Dec 2012 22:51:49 +0000 (14:51 -0800)]
Merge pull request #456 from jan0sch/master

Added gitignore file for Typo3.

11 years agoMerge pull request #318 from macagua/master
Daniel Hengeveld [Wed, 19 Dec 2012 22:50:24 +0000 (14:50 -0800)]
Merge pull request #318 from macagua/master

Added gitignore for Plone CMS

11 years agoMerge pull request #481 from larsw/patch-1
Daniel Hengeveld [Wed, 19 Dec 2012 22:37:59 +0000 (14:37 -0800)]
Merge pull request #481 from larsw/patch-1

Added section for SQL Server files

11 years agoMerge pull request #482 from amalrik/change_global_osx_to_unix_line_endings
Daniel Hengeveld [Wed, 19 Dec 2012 22:37:14 +0000 (14:37 -0800)]
Merge pull request #482 from amalrik/change_global_osx_to_unix_line_endings

change the line endings of Global/OSX from dos to unix format

11 years agoMerge pull request #463 from michaelminter/patch-1
Daniel Hengeveld [Wed, 19 Dec 2012 22:35:58 +0000 (14:35 -0800)]
Merge pull request #463 from michaelminter/patch-1

add .project files to .gitignore

11 years agoMerge pull request #479 from mfloryan/cSharpAdditions
Daniel Hengeveld [Wed, 19 Dec 2012 22:32:10 +0000 (14:32 -0800)]
Merge pull request #479 from mfloryan/cSharpAdditions

C# additions

11 years agoMerge pull request #454 from adrie-dh/patch-1
Daniel Hengeveld [Wed, 19 Dec 2012 22:30:39 +0000 (14:30 -0800)]
Merge pull request #454 from adrie-dh/patch-1

Concrete5: Also ignore /tmp files

11 years agoMerge pull request #404 from jschmid/patch-1
Daniel Hengeveld [Wed, 19 Dec 2012 22:24:33 +0000 (14:24 -0800)]
Merge pull request #404 from jschmid/patch-1

Android: Ignore the proguard folder

11 years agoMerge pull request #413 from mibe/eagle
Daniel Hengeveld [Wed, 19 Dec 2012 22:16:46 +0000 (14:16 -0800)]
Merge pull request #413 from mibe/eagle

Eagle

11 years agoMerge pull request #423 from pingwinator/master
Daniel Hengeveld [Wed, 19 Dec 2012 22:12:59 +0000 (14:12 -0800)]
Merge pull request #423 from pingwinator/master

add *.hmap

11 years agoMerge pull request #475 from duncandee/patch-1
Daniel Hengeveld [Wed, 19 Dec 2012 22:06:40 +0000 (14:06 -0800)]
Merge pull request #475 from duncandee/patch-1

Update Wordpress.gitignore

11 years agoMerge pull request #470 from pronebird/master
Daniel Hengeveld [Wed, 19 Dec 2012 22:02:17 +0000 (14:02 -0800)]
Merge pull request #470 from pronebird/master

node_modules

11 years agoMerge pull request #461 from johnmccutchan/master
Daniel Hengeveld [Wed, 19 Dec 2012 21:58:55 +0000 (13:58 -0800)]
Merge pull request #461 from johnmccutchan/master

Add Dart language support

11 years agoMerge pull request #462 from mwitek/update-rails
Daniel Hengeveld [Wed, 19 Dec 2012 21:56:03 +0000 (13:56 -0800)]
Merge pull request #462 from mwitek/update-rails

added .rvmrc to the list of ignored extentions

11 years agoMerge remote-tracking branch 'upstream/master' 456/head
Jens Jahnke [Wed, 19 Dec 2012 13:02:28 +0000 (14:02 +0100)]
Merge remote-tracking branch 'upstream/master'

11 years agoMerge pull request #490 from Haacked/add-mit-license
Rob Sanheim [Wed, 19 Dec 2012 08:37:33 +0000 (00:37 -0800)]
Merge pull request #490 from Haacked/add-mit-license

Adding an MIT license

11 years agoAdding an MIT license 490/head
Phil Haack [Mon, 17 Dec 2012 19:21:18 +0000 (11:21 -0800)]
Adding an MIT license

Want to make it clear that anybody can use these files
in any way they need to.

12 years agochange the line endings of Global/OSX from dos to unix format 482/head
amalrik [Thu, 22 Nov 2012 23:33:12 +0000 (21:33 -0200)]
change the line endings of Global/OSX from dos to unix format

12 years agoAdded section for SQL Server files 481/head
Lars Wilhelmsen [Thu, 22 Nov 2012 12:30:04 +0000 (13:30 +0100)]
Added section for SQL Server files

Ignore SQL Server Database and log files in App_Data.

12 years agoIgnore SASS cache 479/head
Marcin Floryan [Tue, 20 Nov 2012 11:06:33 +0000 (11:06 +0000)]
Ignore SASS cache

Adds ignore for a sass cache used by Mindscape Web Workbench (generatings css
from .scss files).

12 years agoRemoved duplication of bin on obj folders
Marcin Floryan [Tue, 20 Nov 2012 11:02:21 +0000 (11:02 +0000)]
Removed duplication of bin on obj folders

These two lines look like a duplicate of what we already have at the top of the
file and if we want to keep it should probably go under # Build results

12 years agoUpdate Wordpress.gitignore 475/head
duncandee [Fri, 16 Nov 2012 07:06:57 +0000 (09:06 +0200)]
Update Wordpress.gitignore

Duplicate sitemap.xml

12 years agoAdd *~ to ignore vim temp file. 474/head
zhaojunmeng [Wed, 14 Nov 2012 14:24:17 +0000 (22:24 +0800)]
Add *~ to ignore vim temp file.

12 years agoUpdate Node.gitignore 470/head
Andrej Mihajlov [Thu, 8 Nov 2012 13:07:25 +0000 (14:07 +0100)]
Update Node.gitignore

12 years agoadd .project files to .gitignore 463/head
Michael Minter [Tue, 30 Oct 2012 17:05:22 +0000 (12:05 -0500)]
add .project files to .gitignore

.project files come from Aptana Studio, a Rails IDE.

12 years agoadded .rvmrc to the list of ignored extentions 462/head
mwitek [Mon, 29 Oct 2012 00:49:30 +0000 (20:49 -0400)]
added .rvmrc to the list of ignored extentions

12 years agoAdd Dart language support 461/head
John McCutchan [Sat, 27 Oct 2012 00:58:35 +0000 (17:58 -0700)]
Add Dart language support

12 years agoAdded gitignore file for Typo3.
Jens Jahnke [Wed, 17 Oct 2012 10:05:58 +0000 (12:05 +0200)]
Added gitignore file for Typo3.

To make it easier to handle typo3 under git.
There is a related entry at stackoverflow:
http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git

12 years agoConcrete5: Also ignore /tmp files 454/head
Adrie den Hartog [Tue, 16 Oct 2012 13:21:31 +0000 (16:21 +0300)]
Concrete5: Also ignore /tmp files

Concrete5: Also ignore /tmp files

12 years agoMerge pull request #450 from rbxbx/patch-1
Coby Chapple [Fri, 12 Oct 2012 07:08:07 +0000 (00:08 -0700)]
Merge pull request #450 from rbxbx/patch-1

Update Leiningen.gitignore

12 years agoUpdate Leiningen.gitignore 450/head
Robert Pitts [Thu, 11 Oct 2012 23:59:14 +0000 (16:59 -0700)]
Update Leiningen.gitignore

/targets/ should be ignored as well

12 years agoMerge pull request #341 from x3ro/fix-sublime
Jared Koumentis [Fri, 5 Oct 2012 22:15:59 +0000 (15:15 -0700)]
Merge pull request #341 from x3ro/fix-sublime

The sublime-project file should be checked into version control

12 years agoMerge pull request #382 from x3ro/latex-addition
Jared Koumentis [Fri, 5 Oct 2012 22:14:44 +0000 (15:14 -0700)]
Merge pull request #382 from x3ro/latex-addition

Ignore *.tdo files generated by the todonotes package

12 years agoMerge pull request #380 from borekb/patch-1
Jared Koumentis [Fri, 5 Oct 2012 22:13:44 +0000 (15:13 -0700)]
Merge pull request #380 from borekb/patch-1

Flex / ActionScript project files removed from .gitignore

12 years agoMerge pull request #440 from nap/master
Jared Koumentis [Fri, 5 Oct 2012 00:53:55 +0000 (17:53 -0700)]
Merge pull request #440 from nap/master

PyCharm IDE project specific files

12 years agoMerge pull request #215 from nkh/patch-1
Jared Koumentis [Fri, 5 Oct 2012 00:50:59 +0000 (17:50 -0700)]
Merge pull request #215 from nkh/patch-1

Do not ignore directory matching /Build/

12 years agoMerge pull request #212 from ikeike443/patch-1
Jared Koumentis [Fri, 5 Oct 2012 00:44:49 +0000 (17:44 -0700)]
Merge pull request #212 from ikeike443/patch-1

Delete duplicated "eclipse" and support ignoring IDEA's metafile such as

12 years agoMerge pull request #349 from tucnak/master
Jared Koumentis [Fri, 5 Oct 2012 00:41:13 +0000 (17:41 -0700)]
Merge pull request #349 from tucnak/master

Gitignore for Qt core developers

12 years agoMerge pull request #354 from misham/sdcc
Jared Koumentis [Fri, 5 Oct 2012 00:38:36 +0000 (17:38 -0700)]
Merge pull request #354 from misham/sdcc

Adding support for SDCC compiler files

12 years agoMerge pull request #321 from torifat/patch-1
Jared Koumentis [Fri, 5 Oct 2012 00:36:47 +0000 (17:36 -0700)]
Merge pull request #321 from torifat/patch-1

duplicate entry for modules removed

12 years agoattempting to merge https://github.com/github/gitignore/pull/310
Jared Koumentis (ShepBook) [Fri, 5 Oct 2012 00:30:20 +0000 (20:30 -0400)]
attempting to merge https://github.com/github/gitignore/pull/310

12 years agoMerge pull request #314 from squallstar/master
Jared Koumentis [Fri, 5 Oct 2012 00:20:07 +0000 (17:20 -0700)]
Merge pull request #314 from squallstar/master

Bancha CMS .gitignore

12 years agoMerge pull request #441 from StanislawSwierc/master
Jared Koumentis [Fri, 5 Oct 2012 00:16:25 +0000 (17:16 -0700)]
Merge pull request #441 from StanislawSwierc/master

Added Windows Store app package directory

12 years agoAdded Windows Store app package directory 441/head
Stanislaw Swierc [Mon, 1 Oct 2012 09:05:17 +0000 (10:05 +0100)]
Added Windows Store app package directory

12 years agoVritualEnv specific files generated automaticaly when a new Env is created 440/head
Jean-Bernard Ratté [Sun, 30 Sep 2012 15:51:29 +0000 (11:51 -0400)]
VritualEnv specific files generated automaticaly when a new Env is created

12 years agoPyCharm IDE project specific files
Jean-Bernard Ratté [Sun, 30 Sep 2012 15:47:35 +0000 (11:47 -0400)]
PyCharm IDE project specific files

12 years agoUpdate README to detail best pull request style
Ted Nyman [Sun, 23 Sep 2012 21:31:30 +0000 (14:31 -0700)]
Update README to detail best pull request style

12 years agoMerge pull request #425 from nateabele/patch-1
Ted Nyman [Mon, 10 Sep 2012 22:00:48 +0000 (15:00 -0700)]
Merge pull request #425 from nateabele/patch-1

The Lithium app should be the root repo folder

12 years agoMerge pull request #363 from Baztoune/master
Ted Nyman [Mon, 10 Sep 2012 21:55:29 +0000 (14:55 -0700)]
Merge pull request #363 from Baztoune/master

Added Play 2.0 working directories