diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-17 06:25:07 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-17 06:25:07 -0500 |
| commit | 6a1afda259c5223449f679a64f932e36df5ebe39 (patch) | |
| tree | 7d754e8a1b7734c6750ca84b28ba0e93213e0a86 /classes/statusnet.ini | |
| parent | d59af0296070cd868855564a0280e4be2c16410d (diff) | |
| parent | 75c00f0054c08c7b49515c849260afbb6913f525 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
classes/statusnet.ini
Diffstat (limited to 'classes/statusnet.ini')
| -rw-r--r-- | classes/statusnet.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 6a7be1008..b2509dac5 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -542,4 +542,4 @@ created = 142 modified = 384 [user_group__keys] -id = N +id = N
\ No newline at end of file |