Merge branch 'dev'

This commit is contained in:
Knah Tsaeb 2013-07-29 12:13:56 +02:00
commit 178abe0782
2 changed files with 9 additions and 0 deletions

2
.gitignore vendored
View file

@ -3,3 +3,5 @@ tmp
videos
.project
bin/cronTask.sh
!videos/.htaccess

7
videos/.htaccess Normal file
View file

@ -0,0 +1,7 @@
AddType video/ogg .ogv
AddType video/mp4 .mp4
AddType video/webm .webm
<Files *.webm>
ForceType application/octet-stream
Header set Content-Disposition attachment
</Files>