more usage of dbm::is_result() and sorted a bit statements

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 374fbc532c0f3a4f5cf0caa45d9855b1c23ea251..9e6504184c03c4347f630441b34c0fc8e133c13c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ include/jquery-1.4.2.min.js
 favicon.*\r
 home.html\r
 addon\r
+*.orig\r
 *~\r
 robots.txt\r
 \r
@@ -52,8 +53,9 @@ nbproject
 #ignore things from transifex-client\r
 venv/\r
 \r
-#ignore git projects in vendor\r
-vendor/**/.git\r
+#ignore Composer dependencies\r
+/vendor\r
+/view/asset\r
 \r
 #ignore config files from JetBrains\r
-/.idea
\ No newline at end of file
+/.idea\r