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
..
deriv
templates	Update insertFormatting() definition	2017-01-08 02:16:03 +11:00
bbedit.png
border.jpg
config.php	Normalize App parameter declaration (view folder)	2017-01-09 23:06:08 +11:00
editicons.png
ff-16.jpg
file.gif
friendika-16.png
head.jpg
lock.cur
login-bg.gif
photo-menu.jpg
screenshot.jpg
shiny.png
style.css
style.php
theme.php	Merge remote-tracking branch 'friendica/develop' into issue/#3062	2017-01-12 09:19:59 +11:00