git://developer.intra2net.com
/
libi2ncommon
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
0d7001c
)
Merge 'new-vacation-notice-UI'
author
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Thu, 14 Apr 2011 13:04:56 +0000 (15:04 +0200)
committer
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Thu, 14 Apr 2011 13:04:56 +0000 (15:04 +0200)
Conflicts:
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.mo
intranator-language/usr/intranator/lang/de/LC_MESSAGES/ui-data.po
No differences found