| commit | db5b34485325574e7831fec36a86bd513ff4b777 | [log] [tgz] |
|---|---|---|
| author | ovander <onno.van.der.straaten@gmail.com> | Mon Sep 23 17:46:03 2013 +0200 |
| committer | ovander <onno.van.der.straaten@gmail.com> | Mon Sep 23 17:46:03 2013 +0200 |
| tree | 87839a07839cd6b7baf25e2d8f795b42c6f650c2 | |
| parent | 58adbb092feed495b5a3822ec2b93a5bb423bef8 [diff] | |
| parent | f37ed80c30d937eb790ecbcf0b0458418377a30c [diff] |
Merge branch 'master' of ssh://ovander@git.eclipse.org/gitroot/epf/org.eclipse.epf.wiki.git Conflicts: source/app/models/version.rb