friendica-github/view/theme
Hypolite Petovan d7f80bf7e7 Merge branch 'develop' into improvement/frio-action-links-to-buttons
# Conflicts:
#	view/theme/frio/js/filebrowser.js
#	view/theme/frio/templates/filebrowser.tpl
2017-03-25 20:27:26 -04:00
..
duepuntozero Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
frio Merge branch 'develop' into improvement/frio-action-links-to-buttons 2017-03-25 20:27:26 -04:00
frost "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
frost-mobile "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00: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