Skip to content

Commit

Permalink
Merge pull request #65 in FFE/ffe-icons from insane-lumberjack to master
Browse files Browse the repository at this point in the history
* commit 'a0bb34ae4026c0040c7933892bcd7e5ea9c0dd33':
  PPM-560 Removed traces of blad, spire, and tre-ikon
  • Loading branch information
wkillerud committed Sep 7, 2016
2 parents 8ff7cc3 + b1fa4c9 commit 5338355
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Version 5.0.0

* A vengeful lumberjack has swung the axe against tre-ikon, spire-ikon, and blad-ikon. It was decided the icons did not fit the brand and should not be used by anyone.

## Version 4.7.0
* Added bygning-pluss-ikon.svg

Expand Down
1 change: 0 additions & 1 deletion icons/blad-ikon.svg

This file was deleted.

1 change: 0 additions & 1 deletion icons/spire-ikon.svg

This file was deleted.

1 change: 0 additions & 1 deletion icons/tre-ikon.svg

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-icons",
"version": "4.7.0",
"version": "5.0.0",
"description": "Felles Front End Icons",
"main": "index.js",
"scripts": {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5338355

Please sign in to comment.