diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 15:09:12 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 15:09:12 -0400 |
| commit | eee1f27f6ac05a8873fd63eeb10599a255949cb7 (patch) | |
| tree | a06cd45276ed3eb7e45549272cebf8c538e568ab /cobbler/webui/master.py | |
| parent | cdca9443cab19f992e76a205533be0d13c091d47 (diff) | |
| parent | b5fdeb836a9340f996b8c9c1b61704052c4e5d8a (diff) | |
| download | third_party-cobbler-eee1f27f6ac05a8873fd63eeb10599a255949cb7.tar.gz third_party-cobbler-eee1f27f6ac05a8873fd63eeb10599a255949cb7.tar.xz third_party-cobbler-eee1f27f6ac05a8873fd63eeb10599a255949cb7.zip | |
Merge branch 'master' into devel
Conflicts:
cobbler.spec
cobbler/webui/master.py
Diffstat (limited to 'cobbler/webui/master.py')
| -rw-r--r-- | cobbler/webui/master.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index d2d1acf..0a6e9dd 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1207674554.5409529 -__CHEETAH_genTimestamp__ = 'Tue Apr 8 13:09:14 2008' +__CHEETAH_genTime__ = 1207681739.292002 +__CHEETAH_genTimestamp__ = 'Tue Apr 8 15:08:59 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' |