Merge branch 'develop' into 'master'

no message



See merge request !16
This commit is contained in:
Giuseppe Nucifora 2016-02-05 10:20:19 +00:00
commit 98afb41ef4

View File

@ -1127,6 +1127,7 @@
09DFBEE319FF263B46BE993205A73171 /* Vendors */ = {
isa = PBXGroup;
children = (
685A9DF61C64AEB40071FDFF /* AFOAuth2Manager */,
);
path = Vendors;
sourceTree = "<group>";
@ -1536,6 +1537,13 @@
path = "../Target Support Files/PEAR-FileManager-iOS";
sourceTree = "<group>";
};
685A9DF61C64AEB40071FDFF /* AFOAuth2Manager */ = {
isa = PBXGroup;
children = (
);
path = AFOAuth2Manager;
sourceTree = "<group>";
};
729C4611053B78A0900E14D5E1734624 /* Classes */ = {
isa = PBXGroup;
children = (