Merge branch 'master' of https://github.com/deajan/osync

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Setup osync with the following config file / the following parameters
+2. Run osync with following parameters
+3. Result
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs**
+Please send logs of what happens.
+Also, you might run osync with _DEBUG=yes environement variable to have more verbose debug logs.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Bitness [e.g. x64 or x86]
+ - Shell (busybox or else)
+
+**Additional context**
+Add any other context about the problem here.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+When submitting a pull request, please modify the files in dev directory rather than those generated on-the-fly.
+
+You may find all code contained in osync.sh in n_osync.sh and ofunctions.sh
+You may run your modified code by using `merge.sh osync` in order to generate ../osync.sh