| .. |
|
app
|
VRFS-648. Use Peter's new resync function instead of FTUESave.
|
2013-09-15 19:55:12 -06:00 |
|
config
|
merging jam-web into web
|
2013-09-15 18:04:37 +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 |
|
lib
|
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
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
script
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
spec
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
test
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
vendor
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
.gitignore
|
* VRFS-438; collapsing all repos into one; requires modification of build files
|
2013-09-15 18:15:16 +00:00 |
|
.ruby-gemset
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
.ruby-version
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
Gemfile
|
* fixing relative paths in gems for develop branch as well
|
2013-09-16 02:28:44 +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
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
build
|
* fixing more path changes
|
2013-09-16 02:36:21 +00:00 |
|
config.ru
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
jenkins
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
migrate.sh
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |