]> git.mxchange.org Git - quix0rs-gnu-social.git/tree
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
-rw-r--r-- 121 .gitignore
-rw-r--r-- 34520 COPYING
-rw-r--r-- 3394 EVENTS.txt
-rw-r--r-- 51606 README
drwxr-xr-x - actions
-rw-r--r-- 6265 apple-touch-icon.png
drwxr-xr-x - avatar
drwxr-xr-x - classes
-rw-r--r-- 8071 config.php.sample
drwxr-xr-x - db
drwxr-xr-x - doc-src
drwxr-xr-x - extlib
-rw-r--r-- 1150 favicon.ico
drwxr-xr-x - file
-rw-r--r-- 273 htaccess.sample
-rw-r--r-- 4978 index.php
-rw-r--r-- 7120 install.php
drwxr-xr-x - js
drwxr-xr-x - lib
drwxr-xr-x - local
drwxr-xr-x - locale
drwxr-xr-x - plugins
drwxr-xr-x - scripts
-rw-r--r-- 1471 sphinx.conf.sample
drwxr-xr-x - theme
drwxr-xr-x - tpl