diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-09-26 16:00:05 -0700 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-09-26 16:00:05 -0700 |
| commit | 6112dcbb6a430651f172a7a07f2e9b7633299705 (patch) | |
| tree | ef751352667eb488dc31132dab73176f92f946e0 /proguard-project.txt | |
| parent | 363231746ae97cb1d909bcde698a0c909035961e (diff) | |
| parent | 112be4f505bd46d74eccc6a344ce1402a32957c5 (diff) | |
Merge branch 'bug/inconsistent-cookie-management' into develop
Diffstat (limited to 'proguard-project.txt')
0 files changed, 0 insertions, 0 deletions