Hypolite Petovan b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 ... # Conflicts: # view/theme/duepuntozero/theme.php # view/theme/smoothly/theme.php		2017-01-12 09:19:59 +11:00
..
duepuntozero	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00
frio	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00
frost	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00
frost-mobile	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00
quattro	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00
smoothly	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00
vier	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00