friendica-github/view/theme
Hypolite Petovan 79f14749df Merge branch 'develop' into improvement/frio-action-links-to-buttons
# Conflicts:
#	view/theme/frio/templates/search_item.tpl
#	view/theme/frio/templates/wall_thread.tpl
2017-03-14 10:45:17 -04:00
..
duepuntozero Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
frio Merge branch 'develop' into improvement/frio-action-links-to-buttons 2017-03-14 10:45:17 -04:00
frost Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
frost-mobile Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
quattro Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
smoothly Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00
vier Backward compatibility for theme other than frio 2017-03-01 23:40:34 -05:00