debianmemberportfolio/ddportfolioservice/controllers
Jan Dittberner 03954ba7e9 Merge branch 'newrules' into pylons0.10
* newrules:
  updated translations
  add ideas for SSH functions as comment
  add idea for debconf list search as comment
  add Debian search
  add website google search
  add patch tracker
  add piuparts
  add support for "firstchar" in patterns
  add ubuntudiff to new group Ubuntu

Resolved conflicts:
	ddportfolioservice/i18n/ddportfolioservice.pot
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
	ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
	ddportfolioservice/model/ddportfolio.ini
2010-05-10 21:33:50 +02:00
..
__init__.py upgrade mako templates, add explicit webhelpers 2010-05-10 19:51:44 +02:00
ddportfolio.py Merge branch 'newrules' into pylons0.10 2010-05-10 21:33:50 +02:00
error.py adapt error controller to new Pylons 2010-05-10 19:51:44 +02:00
showformscripts.py import missing abort function 2010-05-10 19:51:44 +02:00
template.py upgrade mako templates, add explicit webhelpers 2010-05-10 19:51:44 +02:00