← Back to branch summary

~vomun-security/anonplus/security-trunk

~vomun-security/anonplus/security-trunk

Viewing all changes in revision 160.

Committer: AJ00200
Date: 2011-11-25 21:24:46 UTC
mfrom: (158.1.2)
Revision ID: git-v1:49f3402d2806f0bf05cba20d985a005227e14638

Fixed merge conflicts.

files removed:
src/api

src/api/__init__.py

src/api/functions.py

src/api/server.py

files modified:
src/libs/config.py

src/libs/friends.py

src/libs/morado/morado.py

src/libs/morado/public.py

Show diffs side-by-side

added added

removed removed

src/api/__init__.py

src/api/functions.py

src/api/server.py

src/libs/config.py

src/libs/friends.py

src/libs/morado/morado.py

src/libs/morado/public.py

Older »