Merge branch 'develop' into shareWithYou_icon_in_fileList
authorpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:43:23 +0000 (08:43 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:43:23 +0000 (08:43 +0200)
commit59a9bc80044decef7f1bd8f9b42d0b0b79f1b09d
tree0083245bd8d72856e4651323b341b7825b2d9b3f
parenta2ac8c19a300bd4bd13d5e47c4b0dd4c373ab282
parent1e08c40f31b3c67133dc314dbad061279a75b931
Merge branch 'develop' into shareWithYou_icon_in_fileList