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
..
images
js
php
templates
border.jpg
editicons.png
file.gif
friendica-16.png
head.jpg
lock.cur
login-bg.gif
login-style.css
photo-menu.jpg
screenshot.jpg
style.css
theme.php
TODO
unsupported