3b96b0ed7c
Conflicts: include/functions.php changes for conflicts with master |
||
---|---|---|
.. | ||
autoload.php | ||
ccache.php | ||
colors.php | ||
crypt.php | ||
db-prefs.php | ||
db.php | ||
digest.php | ||
errorhandler.php | ||
feedbrowser.php | ||
functions.php | ||
labels.php | ||
login_form.php | ||
rssfuncs.php | ||
sanity_check.php | ||
sanity_config.php | ||
sessions.php | ||
version.php |