mirror of
https://github.com/nunocoracao/blowfish.git
synced 2026-01-30 16:31:52 +01:00
fixed conflicts
This commit is contained in:
@@ -80,14 +80,6 @@
|
||||
"Personal site"
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "chris.banes.dev",
|
||||
"url": "https://chris.banes.dev",
|
||||
"source": "n/a",
|
||||
"tags": [
|
||||
"Personal site"
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "fahru.my.id",
|
||||
"url": "https://www.fahru.my.id",
|
||||
@@ -617,7 +609,7 @@
|
||||
},
|
||||
{
|
||||
"title": "innerknowing",
|
||||
"url": "https://innerknowing.xyz",
|
||||
"url": "https://innerknowing.xyz/en/",
|
||||
"source": "n/a",
|
||||
"tags": [
|
||||
"Personal site",
|
||||
@@ -649,5 +641,15 @@
|
||||
"tags": [
|
||||
"Personal blog"
|
||||
]
|
||||
},
|
||||
{
|
||||
"title": "Adam Madej - Gameplay Animator",
|
||||
"url": "http://www.adammadej.com/",
|
||||
"source": "https://github.com/arahmitz/adamblogstuff",
|
||||
"tags": [
|
||||
"Portfolio Site",
|
||||
"Blog",
|
||||
"Personal Site"
|
||||
]
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user