projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
06ab3eb
bc57d7f
)
Merge pull request #674 from fermionic/20130503-basic-video-support
author
fermionic
<fermion@gmx.com>
Sat, 11 May 2013 15:33:36 +0000
(08:33 -0700)
committer
fermionic
<fermion@gmx.com>
Sat, 11 May 2013 15:33:36 +0000
(08:33 -0700)
basic video playback support using VideoJS
1
2
boot.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
boot.php
Simple merge