Harry Bomrah
5de7fcfaf6
Conflicts: app/assets/javascripts/desktop/orbitdesktop.js app/controllers/admin/import_data_controller.rb Conflicts: vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb |
||
---|---|---|
app | ||
config | ||
db | ||
doc | ||
lib | ||
log | ||
patch | ||
public | ||
script | ||
solr/conf | ||
spec | ||
tmp | ||
vendor | ||
.gitignore | ||
.rspec | ||
Gemfile | ||
Guardfile | ||
README.md | ||
Rakefile | ||
config.ru | ||
dump.rdb | ||
orbitdefault.zip |
README.md
Ruling Orbit
RulingSite-s Version 4.0 Beta