change actions.py

2017-02-17 00:44:43 +03:00
parent 14d8235208
commit 6b07ab774d
9 changed files with 118963 additions and 123351 deletions
@@ -1,5 +1 @@
-<<<<<<< HEAD
-3ab94be864200e67818d43dc31a05ad83f937ebf
-=======
-d270436d849d14d16405730b204f4b0380a84a01
->>>>>>> ad38b38690d46fcce81a7169fbde0aeec6dafa24
+c1d0f192f9e8398d361517ae43ec3648883f3708