Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	.gitignore
This commit is contained in:
Gaetan Semet 2016-05-26 15:28:55 +02:00
commit e027530ca5
60 changed files with 1813 additions and 268 deletions

View file

@ -1,5 +1,10 @@
# Add yourself some shortcuts to projects you often work on
# Example:
# You can put files here to add functionality separated per file, which
# will be ignored by git.
# Files on the custom/ directory will be automatically loaded by the init
# script, in alphabetical order.
# For example: add yourself some shortcuts to projects you often work on.
#
# brainstormr=~/Projects/development/planetargon/brainstormr
# cd $brainstormr
#
# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
#