Changeset [36dc8de1292c570da5fb2219ee947f22743a0df9] by Ed Finkler
May 6th, 2010 @ 09:17 PM
Merge branch 'spazcoreprefs' into master-multi
Conflicts:
app/libs/spaz.sys.js
app/models/spaz.prefs.js
app/spaz.js
http://github.com/funkatron/spaz-desktop-air/commit/36dc8de1292c570...
Committed by Ed Finkler
- A app/views/spaz.accountprefs.js
- M app/helpers/spaz.js
- M app/models/spaz.prefs.js
- M app/spaz.js
- M app/views/spaz.conversation.js
- M app/views/spaz.imageuploader.js
- M app/views/spaz.timelines.js
- M app/views/spaz.ui.js
- M application.xml
- M bootstrap.html
- M index.html
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
The Spaz Desktop project