Sparky4567 308f968576 Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

..

about.php

Yello

2018-02-25 20:28:26 +02:00

add-user.php

Yello

2018-02-25 20:28:26 +02:00

categories.php

Yello

2018-02-25 20:28:26 +02:00

configure-plugin.php

Yello

2018-02-25 20:28:26 +02:00

content.php

Yello

2018-02-25 20:28:26 +02:00

dashboard.php

Yello

2018-02-25 20:28:26 +02:00

developers.php

Yello

2018-02-25 20:28:26 +02:00

edit-category.php

Yello

2018-02-25 20:28:26 +02:00

edit-content.php

Yello

2018-02-25 20:28:26 +02:00

edit-user.php

Yello

2018-02-25 20:28:26 +02:00

install-plugin.php

Yello

2018-02-25 20:28:26 +02:00

install-theme.php

Yello

2018-02-25 20:28:26 +02:00

login-email.php

Yello

2018-02-25 20:28:26 +02:00

login.php

Yello

2018-02-25 20:28:26 +02:00

logout.php

Yello

2018-02-25 20:28:26 +02:00

new-category.php

Yello

2018-02-25 20:28:26 +02:00

new-content.php

Yello

2018-02-25 20:28:26 +02:00

plugins-position.php

Plugin position

2018-02-06 18:26:59 +01:00

plugins.php

Yello

2018-02-25 20:28:26 +02:00

settings-advanced.php

Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

settings-general.php

Yello

2018-02-25 20:28:26 +02:00

settings-regional.php

Yello

2018-02-25 20:28:26 +02:00

themes.php

Yello

2018-02-25 20:28:26 +02:00

uninstall-plugin.php

Yello

2018-02-25 20:28:26 +02:00

user-password.php

Yello

2018-02-25 20:28:26 +02:00

users.php

Yello

2018-02-25 20:28:26 +02:00