projects
/
angular-drzb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0cd637d
6e79b7c
)
Merge remote branch 'remotes/origin/drzb2013v2' into drzb2013v2
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Tue, 8 Jan 2013 12:58:42 +0000
(13:58 +0100)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Tue, 8 Jan 2013 12:58:42 +0000
(13:58 +0100)
Conflicts:
app/en/partials/registration.html
Trivial merge