diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-17 15:36:45 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-17 15:36:45 -0400 |
| commit | 74b237d46d9472a125315e35d77bf2d0fdabaa7e (patch) | |
| tree | a0d99585db56d471881176fec43e9b8aa90f07a9 /view/admin_aside.tpl | |
| parent | 5b407b5ee7268cce3a3dbb659a5b33dc62ab93d7 (diff) | |
| download | volse-hubzilla-74b237d46d9472a125315e35d77bf2d0fdabaa7e.tar.gz volse-hubzilla-74b237d46d9472a125315e35d77bf2d0fdabaa7e.tar.bz2 volse-hubzilla-74b237d46d9472a125315e35d77bf2d0fdabaa7e.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: theme-settings: "wide"-option and new screenshots
* master:
Diffstat (limited to 'view/admin_aside.tpl')
0 files changed, 0 insertions, 0 deletions