Merge conflicts

This commit is contained in:
dkhamsing 2020-04-20 07:33:37 -07:00
commit af9b263da9

View File

@ -1249,9 +1249,7 @@
"license": "mit",
"date_added": "Fri Jul 31 10:48:33 2015 -0400",
"suggested_by": "@Jay Hickey",
"screenshots": [
]
"screenshots": []
},
{
"title": "Ghostery Privacy Browser",
@ -1863,9 +1861,7 @@
"stars": 41,
"date_added": "Sat May 7 21:01:14 2016 -0500",
"suggested_by": "@Kevin Bautista",
"screenshots": [
]
"screenshots": []
},
{
"title": "Bequest",
@ -1984,9 +1980,7 @@
"license": "other",
"date_added": "Tue May 3 06:36:59 2016 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "GitHub-Swift",
@ -2141,9 +2135,7 @@
"license": "other",
"date_added": "Mon Nov 16 22:20:44 2015 -0800",
"suggested_by": "@ReadmeCritic",
"screenshots": [
]
"screenshots": []
},
{
"title": "Coins",
@ -2413,9 +2405,7 @@
"license": "apache-2.0",
"date_added": "Fri May 15 12:23:53 2015 -0400",
"suggested_by": "@Sanket",
"screenshots": [
]
"screenshots": []
},
{
"title": "Canabalt",
@ -3101,9 +3091,7 @@
"stars": 73,
"date_added": "Wed, 15 Apr 2015 06:59:02 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "Speak",
@ -3119,9 +3107,7 @@
"license": "mit",
"date_added": "Mon Apr 6 11:49:54 2015 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "AA-Keyboard",
@ -4698,9 +4684,7 @@
],
"date_added": "Wed Mar 18 11:12:08 2015 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "v2ex",
@ -4821,9 +4805,7 @@
"license": "mit",
"date_added": "Wed Jan 13 08:29:59 2016 -0800",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "News/YC",
@ -4861,9 +4843,7 @@
"stars": 1113,
"date_added": "Thu Mar 19 07:22:04 2015 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "Simple Reader",
@ -5525,9 +5505,7 @@
"license": "mit",
"date_added": "Mon Feb 8 06:15:08 2016 -0800",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "Peggsite",
@ -5543,9 +5521,7 @@
"license": "other",
"date_added": "Tue Mar 17 07:22:10 2015 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "StreetMusicMap",
@ -5765,9 +5741,7 @@
"stars": 28,
"date_added": "Tue Jan 26 17:23:50 2016 +0200",
"suggested_by": "@Spiros Gerokostas",
"screenshots": [
]
"screenshots": []
},
{
"title": "Planc",
@ -6630,9 +6604,7 @@
"stars": 48,
"date_added": "Mon Oct 12 09:06:52 2015 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "Swiflytics",
@ -7021,9 +6993,7 @@
"stars": 265,
"date_added": "Thu Aug 27 07:22:13 2015 -0700",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "SwiftNote",
@ -7282,9 +7252,7 @@
"license": "cc0-1.0",
"date_added": "Tue, 17 Mar 2015 14:51:44 -0400",
"suggested_by": "@jeffreyjackson",
"screenshots": [
],
"screenshots": [],
"stars": 0
},
{
@ -7344,9 +7312,7 @@
"license": "cc0-1.0",
"date_added": "Tue, 17 Mar 2015 14:51:44 -0400",
"suggested_by": "@jeffreyjackson",
"screenshots": [
],
"screenshots": [],
"stars": 0
},
{
@ -7986,9 +7952,7 @@
"stars": 2043,
"date_added": "Mon Jan 26 15:48:19 2015 -0800",
"suggested_by": "@dkhamsing",
"screenshots": [
]
"screenshots": []
},
{
"title": "GitBucket",
@ -9100,9 +9064,7 @@
"stars": 117,
"date_added": "Tue May 31 23:42:32 2016 -0600",
"suggested_by": "@scribblemaniac",
"screenshots": [
]
"screenshots": []
},
{
"title": "Skeleton Key",
@ -9311,9 +9273,7 @@
],
"date_added": "Wed Jun 1 22:18:46 2016 -0600",
"suggested_by": "@scribblemaniac",
"screenshots": [
]
"screenshots": []
},
{
"title": "AppSlate",
@ -9401,9 +9361,7 @@
"stars": 19,
"date_added": "Wed Jun 1 22:36:19 2016 -0600",
"suggested_by": "@scribblemaniac",
"screenshots": [
]
"screenshots": []
},
{
"title": "Frotz",
@ -9491,9 +9449,7 @@
"license": "lgpl-2.1",
"date_added": "Wed Jun 1 22:58:57 2016 -0600",
"suggested_by": "@scribblemaniac",
"screenshots": [
]
"screenshots": []
},
{
"title": "Prey",
@ -11159,9 +11115,7 @@
"date_added": "Fri May 15 12:15:50 2015 -0400",
"suggested_by": "@Sanket",
"stars": 428,
"screenshots": [
]
"screenshots": []
},
{
"title": "osia",
@ -11818,9 +11772,7 @@
"tags": [
"react native"
],
"screenshots": [
],
"screenshots": [],
"license": "mit",
"date_added": "Sep 14 2016",
"suggested_by": "@dkhamsing",
@ -18711,11 +18663,17 @@
},
{
"title": "mChat",
"category-ids": ["communication"],
"tags": ["swift"],
"category-ids": [
"communication"
],
"tags": [
"swift"
],
"description": "Real-time messaging app using firebase",
"source": "https://github.com/realpaliy/mChat",
"screenshots": ["https://imgur.com/uvinWB9"],
"screenshots": [
"https://imgur.com/uvinWB9"
],
"date_added": "April 2 2020",
"license": "apache-2.0",
"suggested_by": "@realpaliy"
@ -18885,7 +18843,6 @@
],
"license": "other",
"source": "https://github.com/VamshiIITBHU14/AppStoreClone",
"tags": [
"swift",
"archive"
@ -18918,7 +18875,9 @@
"license": "mit",
"source": "https://github.com/sloria/Fingerspelling-iOS",
"itunes": "https://apps.apple.com/app/asl-fingerspelling-practice/id1503242863",
"screenshots": ["https://raw.githubusercontent.com/sloria/Fingerspelling-iOS/master/media/screenshot.png"],
"screenshots": [
"https://raw.githubusercontent.com/sloria/Fingerspelling-iOS/master/media/screenshot.png"
],
"tags": [
"swift",
"combine"
@ -18926,7 +18885,6 @@
"date_added": "Apr 11 2020",
"suggested_by": "@sloria"
},
{
"title": "FreeTimePicker",
"category-ids": [
@ -18936,7 +18894,9 @@
"description": "Find free time in your calendar",
"license": "mit",
"source": "https://github.com/fromkk/FreeTimePicker",
"screenshots": ["https://github.com/fromkk/FreeTimePicker/raw/master/images/search.png"],
"screenshots": [
"https://github.com/fromkk/FreeTimePicker/raw/master/images/search.png"
],
"tags": [
"swift",
"combine"
@ -19260,6 +19220,29 @@
"date_added": "Apr 17 2020",
"suggested_by": "@dkhamsing"
},
{
"title": "palette-from-image",
"category-ids": [
"color",
"clone"
],
"description": "Inspire by https://earthview.withgoogle.com",
"license": "other",
"source": "https://github.com/chuongtrh/palette-from-image",
"tags": [
"swift",
"palette",
"generate color",
"earthview"
],
"screenshots": [
"https://github.com/chuongtrh/palette-from-image/blob/master/screenshots/screenshot1.png?raw=true",
"https://github.com/chuongtrh/palette-from-image/blob/master/screenshots/screenshot2.png?raw=true",
"https://github.com/chuongtrh/palette-from-image/blob/master/screenshots/screenshot3.png?raw=true"
],
"date_added": "Apr 19 2020",
"suggested_by": "@chuongtrh"
},
{
"title": "30 mini Swift Apps for self-study",
"category-ids": [
@ -19306,6 +19289,18 @@
"screenshots": [
"https://i.imgur.com/9thpBwq.gif"
]
} ,{
"title": "Zeplin Client for Zeplin.io",
"category-ids": ["developer", "photo"],
"description": "Say hello to first unofficial Zeplin companion app, Zeplin Client! It is the only app you need to preview your designs on Zeplin. Simply, log in to your Zeplin account and Zeplin Client will bring your projects into your iPhone.",
"source": "https://github.com/relevantfruit/zeplin-ios",
"tags": ["swift"],
"itunes": "https://apps.apple.com/us/app/zeplin-client/id1501596135?ls=1",
"screenshots": ["https://github.com/relevantfruit/zeplin-ios/raw/master/docs/ZeplinClient_GitHub.png?raw=true"],
"date_added": "Apr 19 2020",
"suggested_by": "@yagiznizipli",
"license": "gnu"
}
]
}