Merge branch 'master' of github.com:pisilinux/main

2017-02-17 00:09:02 +03:00
parent 7a571aa05b ad38b38690
commit 6b37f9757e
74 changed files with 118810 additions and 117492 deletions
@@ -1 +1,5 @@
-d4230505429432c8216c89fb4dab5f415aeca34b
+<<<<<<< HEAD
+d4230505429432c8216c89fb4dab5f415aeca34b
+=======
+7ababfff3ab8491e4ab54d5876dd8b44aac0c761
+>>>>>>> ad38b38690d46fcce81a7169fbde0aeec6dafa24