|
config
|
merge conflict
|
2014-02-28 07:07:26 +00:00 |
|
db
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
doc
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
features
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
log
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
public
|
VRFS-750 Starting generic page for 503 error
|
2014-01-02 19:35:50 -06:00 |
|
script
|
* merged
|
2014-02-07 17:38:51 +00:00 |
|
test
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
vendor
|
* VRFS-1047 - looks good; no audio hooked up
|
2014-02-27 00:38:01 +00:00 |
|
.ruby-gemset
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
Guardfile
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
ORIG_LICENSE
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
README.md
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
Rakefile
|
* VRFS-801 - almost working on my dev machine
|
2014-01-11 04:57:07 +00:00 |
|
config.ru
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
jenkins
|
* VRFS-1016
|
2014-01-31 14:25:17 -06:00 |
|
migrate.sh
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |