diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-03 14:59:04 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-03 14:59:04 -0700 |
| commit | aa58f68bfd2e2f0f1ebc58a9b399fda986356c99 (patch) | |
| tree | 6bd626b5f0181373fe5abc9cee15721b998f5029 /.gitattributes | |
| parent | 37c78bcf055276b1e1817f718cfd36294f1f7d87 (diff) | |
| parent | 2f1203994183ad2b66721032942a937444e4943c (diff) | |
| download | volse-hubzilla-aa58f68bfd2e2f0f1ebc58a9b399fda986356c99.tar.gz volse-hubzilla-aa58f68bfd2e2f0f1ebc58a9b399fda986356c99.tar.bz2 volse-hubzilla-aa58f68bfd2e2f0f1ebc58a9b399fda986356c99.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/it/messages.po
view/it/strings.php
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions