Merge remote-tracking branch 'origin/master' into everard

Conflicts:
	zshenv
This commit is contained in:
Thomas Ruoff
2014-10-31 09:17:23 +01:00
5 changed files with 112 additions and 71 deletions

5
zshenv
View File

@@ -15,6 +15,11 @@ export NVM_DIR="$HOME/.nvm"
# todo.sh
alias t=todo.sh
# Base16 Shell
BASE16_SCHEME="solarized"
BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
# BW specific stuff
JIRA_URL="https://jira.brandwatch.com"