projects / remotestorage.js / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eadb86f c4b4b2c)
Merge branch 'remotestorage0.9-develop' of github.com:remotestorage/remotestorage...
authorggrin <ggrin@lavabit.com>
Mon, 21 Oct 2013 14:50:43 +0000 (16:50 +0200)
committerggrin <ggrin@lavabit.com>
Mon, 21 Oct 2013 14:50:43 +0000 (16:50 +0200)
commit87ce59afe6064cb2db1d0878cdc4936bceab3891
treeb353be2414eb3218fba8020fb7e9a1b38144ba99tree | snapshot
parenteadb86fa9b1a5466ae64aedb4634be8109c53cc2commit | diff
parentc4b4b2caf14e16d9b4534b1d90ba2623adb3ec7bcommit | diff
Merge branch 'remotestorage0.9-develop' of github.com:remotestorage/remotestorage.js into remotestorage0.9-develop

Conflicts:
src/assets.js
Makefile diff1 | diff2 | blob | history
The missing link between localStorage and a self-controlled REST server