Browse Source

Merge branch 'gnupg' into wip-1.1.0

Helmut K. C. Tessarek 7 years ago
parent
commit
617c2d3e0c
2 changed files with 8 additions and 0 deletions
  1. 7 0
      src/icons/icons.yml
  2. 1 0
      src/icons/svg/gnupg.svg

+ 7 - 0
src/icons/icons.yml

@@ -6977,6 +6977,7 @@ icons:
     categories:
       - Brand Icons
 
+<<<<<<< HEAD
   - name:       Hackaday
     id:         hackaday
     unicode:    f30a
@@ -7001,5 +7002,11 @@ icons:
     filter:
       - message
       - texting
+
+  - name:       GnuPG
+    id:         gnupg
+    unicode:    f30d
+    created:    1.0
+    url:        gnupg.org
     categories:
       - Brand Icons

File diff suppressed because it is too large
+ 1 - 0
src/icons/svg/gnupg.svg


Some files were not shown because too many files changed in this diff