Merge branch 'master' of http://pi.techtube.pl:3000/krzysiej/paper-pi

Conflicts: .gitignore
2017-07-18 09:00:17 +02:00
parent 59ac39008d e99b7cea1b
commit 3c0ebd26ed
2 changed files with 27 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,26 @@
 Homestead.json
 Homestead.yaml
 .env
+
+# ---> Laravel
+vendor/
+node_modules/
+npm-debug.log
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+storage/*.key
+.env.*.php
+.env.php
+.env
+Homestead.yaml
+Homestead.json
+
+# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
+.rocketeer/
+
--- a/README.md
+++ b/README.md
@@ -0,0 +1,4 @@
+# paper-pi
+
+Webowa aplikacja napisana w PHP pozwalająca na drukowanie za pomocąpodłączonej do raspberry pi drukarki termicznej i zarządzanie zapisanymi wydrukami.
+