diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-02-28 16:43:08 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-02-28 16:43:08 -0500 |
| commit | 21d1dc48a8e83e55c55d894f85b742ef667553d7 (patch) | |
| tree | d48c78c4ff3d59f06e4cf506ba46375f6f77e7d6 /.htaccess | |
| parent | 718c5ea23e642f8eb3fd91670e5b8faf705df55b (diff) | |
| parent | 733f830be4b554c83361e877a5f1108767a815fc (diff) | |
| download | volse-hubzilla-21d1dc48a8e83e55c55d894f85b742ef667553d7.tar.gz volse-hubzilla-21d1dc48a8e83e55c55d894f85b742ef667553d7.tar.bz2 volse-hubzilla-21d1dc48a8e83e55c55d894f85b742ef667553d7.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix url and network display
* master:
Diffstat (limited to '.htaccess')
0 files changed, 0 insertions, 0 deletions