Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
justauserx-hookhead
|
|
|
|
|
|
|
|
Conflicts:
include/functions.php
changes for conflicts with master
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
classes/feeds.php
fix for merging up to the origin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
color
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
separate mark button to article botton in combined mode (closes #382)
|
|
This reverts commit ecac674adebce15fa8921b8c86cda2dba6ee7c34.
|