Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomassnielsen
thomassnielsen committed Apr 11, 2015
2 parents 487b6ef + d124c80 commit 8d108ee
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,8 @@ Pods/*/*/*/*
###
# Custom icon for the folder
Icon

###
# From Jekyll
/_site
/.sass-cache

0 comments on commit 8d108ee

Please sign in to comment.