diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /lib/plugins/acl/pix | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'lib/plugins/acl/pix')
| -rw-r--r-- | lib/plugins/acl/pix/group.png | bin | 753 -> 700 bytes |
| -rw-r--r-- | lib/plugins/acl/pix/ns.png | bin | 853 -> 800 bytes |
| -rw-r--r-- | lib/plugins/acl/pix/page.png | bin | 635 -> 582 bytes |
| -rw-r--r-- | lib/plugins/acl/pix/user.png | bin | 706 -> 653 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/lib/plugins/acl/pix/group.png b/lib/plugins/acl/pix/group.png Binary files differindex 7fb4e1f1e..d80eb2606 100644 --- a/lib/plugins/acl/pix/group.png +++ b/lib/plugins/acl/pix/group.png diff --git a/lib/plugins/acl/pix/ns.png b/lib/plugins/acl/pix/ns.png Binary files differindex da3c2a2d7..c35e832da 100644 --- a/lib/plugins/acl/pix/ns.png +++ b/lib/plugins/acl/pix/ns.png diff --git a/lib/plugins/acl/pix/page.png b/lib/plugins/acl/pix/page.png Binary files differindex 03ddd799f..b1b7ebe94 100644 --- a/lib/plugins/acl/pix/page.png +++ b/lib/plugins/acl/pix/page.png diff --git a/lib/plugins/acl/pix/user.png b/lib/plugins/acl/pix/user.png Binary files differindex 8fd539e9c..7b4a507a0 100644 --- a/lib/plugins/acl/pix/user.png +++ b/lib/plugins/acl/pix/user.png |
