diff options
| author | Maxwell Salzberg <maxwell@joindiaspora.com> | 2012-02-19 05:12:14 +0400 |
|---|---|---|
| committer | Maxwell Salzberg <maxwell@joindiaspora.com> | 2012-02-19 05:12:14 +0400 |
| commit | 7aba1ce1f7745da1885191c2e25aa37d33f6acae (patch) | |
| tree | 13be04fb2306beefd6baf9615f6615ba85472447 /config/locales/javascript/javascript.vi.yml | |
| parent | 42bed7ae1fc4eac94582457b1db3ea3a1718595f (diff) | |
| parent | 4d634cae24060652ece6321a39c629cfabb46b78 (diff) | |
Merge branch 'Raven24-user-photos'
Conflicts:
public/javascripts/app/router.js
public/stylesheets/sass/application.sass
Diffstat (limited to 'config/locales/javascript/javascript.vi.yml')
0 files changed, 0 insertions, 0 deletions