Merge branch 'media_panel'
authorBoris Bobrov <breton@cynicmansion.ru>
Fri, 5 Feb 2016 01:33:05 +0000 (04:33 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Fri, 5 Feb 2016 01:33:05 +0000 (04:33 +0300)
commit3b6b009077955c94e76cd2248e16a32dde1d90cf
treefd4db259e709217fbc557dc82dd7948fc3ba4727
parentf13225fa6dc2b4537300e5bed4b587619de9cf26
parent41076dc96bbf273c5a04978e2046ea8738b1eee0
Merge branch 'media_panel'