Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
+138298
-138190
File diff suppressed because it is too large
Load Diff
@@ -1 +1,5 @@
|
||||
2e4ee61eb2c6a1dafe537a86247e0952b7add67e
|
||||
<<<<<<< HEAD
|
||||
2e4ee61eb2c6a1dafe537a86247e0952b7add67e
|
||||
=======
|
||||
2f1c5dcaba29cc8a7666dab1d8f123dd88ad6568
|
||||
>>>>>>> af9ec948455dd1beeb26f29f623186dfd41ebd17
|
||||
|
||||
@@ -1 +1,5 @@
|
||||
1db994a311e9e41a6aac864f08177eae7684dafa
|
||||
<<<<<<< HEAD
|
||||
1db994a311e9e41a6aac864f08177eae7684dafa
|
||||
=======
|
||||
d6786dfe2e2d2fab60dd23189cb316b4df959647
|
||||
>>>>>>> af9ec948455dd1beeb26f29f623186dfd41ebd17
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<Update release="1">
|
||||
<Date>2017-12-10</Date>
|
||||
<Version>0.7</Version>
|
||||
<Comment>First release.</Comment>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
|
||||
Reference in New Issue
Block a user