7e3993b67f
Conflicts: vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb |
||
---|---|---|
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 |
README.md
Ruling Orbit
RulingSite-s Version 4