filippodb/App-Open-Source-per-iPhone-iPad-Apple-Watch-TV
1
0
Fork 0
mirror of https://github.com/dkhamsing/open-source-ios-apps.git synced 2025-02-24 07:38:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Daniel Khamsing 2016-07-12 08:12:58 -07:00
commit 10aa19183e
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contents.json
View File

@ -4995,6 +4995,7 @@
"stars": 27 "stars": 27
}, },
{ {
<<<<<<< HEAD
"title": "Mini vMac", "title": "Mini vMac",
"category": ["emulators"], "category": ["emulators"],
"description": "Early 68K Macintosh emulator", "description": "Early 68K Macintosh emulator",
@ -5079,6 +5080,23 @@
"license": "gpl-3.0", "license": "gpl-3.0",
"description": "Mobile shell terminal based on Mosh", "description": "Mobile shell terminal based on Mosh",
"source": "https://github.com/blinksh/blink" "source": "https://github.com/blinksh/blink"
},{
"title": "Count It",
"category": ["rxswift", "apple-watch"],
"description": "Never lose the count again. Dead simple App with Apple Watch integration that lets you count anything.",
"source": "https://github.com/PiXeL16/CountItApp",
"itunes": "https://itunes.apple.com/app/id1098893335",
"stars": 10,
"tags": ["swift"]
},
{
"title": "Send To Me",
"category": "tasks",
"description": "Share content to your email with a single tap.",
"source": "https://github.com/PiXeL16/SendToMe",
"itunes": "https://itunes.apple.com/app/id1100027787",
"stars": 8,
"tags": ["swift"]
} }
] ]
} }