Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service
authorMichael Andres <ma@suse.de>
Wed, 2 Jul 2008 21:31:49 +0000 (23:31 +0200)
committerMichael Andres <ma@suse.de>
Wed, 2 Jul 2008 21:31:49 +0000 (23:31 +0200)
commit988098396ef4599d5fc2669cf883e1dc06d65c2d
treecdd55210168cc1a1b62d9d9e34e3ca915a9b36a7
parent0f1f84038b0e64624875c4a5f3b562c399f1fb6b
parent4903d59c05ccf319c1dae6b41a589e321e7b4431
Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service

Conflicts:

yast-api/db/development.sqlite3
yast-api/config/routes.rb