Geoff Schmidt d9215a640b Merge branch 'refs/heads/devel' into sso ...

Conflicts:
	History.md
	docs/client/api.html
	docs/client/api.js
	packages/accounts-base/accounts_server.js
	packages/livedata/crossbar.js
	packages/livedata/livedata_connection.js
	packages/livedata/livedata_server.js
	packages/livedata/livedata_server_tests.js
	packages/livedata/stream_client_nodejs.js
	packages/test-helpers/package.js

2013-12-06 18:47:56 -08:00

..

.npm/package

Shrinkwrap update.

2013-10-03 15:52:19 -07:00

.gitignore

Factor webapp-specific stuff (and keepalive) out of boot.js into webapp package.

2013-05-13 11:58:58 -07:00

package.js

Make webapp a follower of proxy.

2013-10-24 16:40:08 -07:00

webapp_server.js

Merge branch 'refs/heads/devel' into sso

2013-12-06 18:47:56 -08:00