Skip to content
Snippets Groups Projects
Commit cc2cdd27 authored by Ghazi Triki's avatar Ghazi Triki
Browse files

Merge remote-tracking branch 'jfsiebel/bbb-rtmp-player-ios' into ios-h264 

# Conflicts:
#	clients/flash/air-client/src/org/bigbluebutton/air/common/views/IOSVideoView.as
parents 838133e9 241797b2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net