-
Holger Just authored
Conflicts: app/models/journal_observer.rb lib/chili_project/version.rb test/unit/principal_drop_test.rb
1eefd4b4
Conflicts: app/models/journal_observer.rb lib/chili_project/version.rb test/unit/principal_drop_test.rb
Name |
Last commit
|
Last update |
---|---|---|
app | Loading commit data... | |
config | Loading commit data... | |
db | Loading commit data... | |
doc | Loading commit data... | |
extra | Loading commit data... | |
files | Loading commit data... | |
lib | Loading commit data... | |
log | Loading commit data... | |
public | Loading commit data... | |
script | Loading commit data... | |
test | Loading commit data... | |
tmp/test | Loading commit data... | |
vendor | Loading commit data... | |
.gitignore | Loading commit data... | |
.gitmodules | Loading commit data... | |
.hgignore | Loading commit data... | |
Gemfile | Loading commit data... | |
README.rdoc | Loading commit data... | |
Rakefile | Loading commit data... |