..
app
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
config
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
db
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
doc
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
lib
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
log
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
public
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
script
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
spec
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
test
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
vendor
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
.gitignore
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
.rspec
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
.rvmrc
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
Gemfile
* fixing jam-admin's build and Gemfile for merging into jam-cloud
2013-09-16 03:19:10 +00:00
README.md
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
README.rdoc
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
Rakefile
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
build
* fixing jam-admin's build and Gemfile for merging into jam-cloud
2013-09-16 03:19:10 +00:00
config.ru
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
jenkins
merging jam-admin into admin
2013-09-16 03:15:31 +00:00
run.sh
merging jam-admin into admin
2013-09-16 03:15:31 +00:00