friendica/view/theme
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
..
cleanzero
comix
comix-plain
darkbubble
darkzero
darkzero-NS
decaf-mobile
diabook
dispy
duepuntozero Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
facepark
frost Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
frost-mobile Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
greenzero
purplezero
quattro Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
slack-NS
slackr
smoothly Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
testbubble
vier Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00