Andreas Fischer b5b0175d59 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop

2014-06-24 20:59:11 +02:00

..

en

Merge branch 'develop-olympus' into develop-ascraeus

2014-06-24 20:59:11 +02:00

index.htm

…