Merge pull request #493 from electron/talhasch-gh-pages

Fix merge conflicts and add ling to apps
electron · Sep 26, 2016 · bccaa6e · bccaa6e
2 parents 107f558 + 0a00097
commit bccaa6e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/_data/apps.yml b/_data/apps.yml
@@ -1971,3 +1971,14 @@
     - "data"
     - "finance"
   icon: "forestpin.png"
+-
+  name: "Ling"
+  description: "REST Client"
+  website: "https://github.com/talhasch/ling"
+  repository: "https://github.com/talhasch/ling"
+  keywords:
+    - "REST Client"
+    - "HTTP"
+    - "Developer Tool"
+  license: "MIT"
+  icon: "ling.png"
diff --git a/images/apps/ling.png b/images/apps/ling.png