diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
| commit | 10b4eda6f0cbb44fde9fb3158bd174c82467f2ee (patch) | |
| tree | 811d72521d8ad7bfb361030c4d320aa03b17ddea /modules/info/views | |
| parent | 42c82ef7f081630c15a5d354205896764348a76a (diff) | |
| parent | b0bb107b7ebb5edbf3bec69ae2e716552eb1adf5 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/libraries/Theme_View.php
themes/admin_default/views/admin.html.php
Diffstat (limited to 'modules/info/views')
| -rw-r--r-- | modules/info/views/info_block.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 3a96937c..db621006 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -32,4 +32,4 @@ <? endif ?> </li> <? endif ?> -</ul>
\ No newline at end of file +</ul> |