← Back to branch summary

~vomun-security/anonplus/security-trunk

« back to all changes in this revision

Viewing changes to src/libs/friends.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/friends.py
8
8
from libs.globals import global_vars
9
9
import libs.encryption.rsa
10
10
from libs.packets import parse_packets, packets_by_id, make_packet
11
 
from api.functions import register_with_api
 
11
from libs.morado.functions import register_with_api
12
12
 
13
13
 
14
14