Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
osben committed Mar 24, 2017
2 parents 4e56544 + 250565e commit 2e9975c
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ simpla/design/compiled/*
# logos categories
/files/categories/*
!/files/categories/index.html
!/files/categories/


# digital products
/files/downloads/*
Expand Down

0 comments on commit 2e9975c

Please sign in to comment.