Merge remote-tracking branch 'origin/master'

# Conflicts: # app/backend/pages/ru/download/index.php # app/backend/pages/ru/manual/tags.php
igordata · Oct 8, 2016 · 4886318 · 4886318
2 parents 30cf96e + 581bc76
commit 4886318
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/app/storage/files/pinpie/pinpie.20160711.zip b/app/storage/files/pinpie/pinpie.20160711.zip