| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
include/zot.php
install/schema_mysql.sql
install/schema_postgres.sql
install/update.php
mod/zfinger.php
|
| | |
|
| | |
|
| |
| |
| |
| | |
permission_update, since some networks send out a notification for duplicate share requests even if connected.
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
| | |
|
| |
| |
| |
| | |
content region
|
| |
| |
| |
| | |
documentation to the INSTALL.txt explaining the choice.
|
|\ \ |
|
| | | |
|
|/ / |
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
install/update.php
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
smaller than the scale target sizes.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
cloud
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
evaluated
|
| | |
|
|\ \ |
|
| | | |
|
|/ /
| |
| |
| | |
drop
|
| |
| |
| |
| | |
endless merge conflicts.
|
| | |
|
| | |
|
| |
| |
| |
| | |
and translateable
|
|\ \ |
|
| | | |
|
|/ / |
|
| | |
|
| |
| |
| |
| | |
injection
|
| | |
|
|\ \
| | |
| | | |
fix consensus items - issue #53
|
| | | |
|