Skip to content

Development - #7

Merged
Sombre-Osmoze merged 3 commits into
masterfrom
development
Jun 1, 2020
Merged

Sombre-Osmoze merged 3 commits into
masterfrom
development

Conversation

@Kilo-Loco

Copy link
Copy Markdown
Member

Need to update master as there is a folder structure issue that has been corrected in development

hybridcattt and others added 3 commits May 31, 2020 22:43
* CocoaPods integration

* Added Firestore and CodableFirebase pods; Added services and Naviagor;

* Added String+STN; Updated Log to use string extension;

* removed Pods/

* removed UIKit import

* removed UIKit import

Co-authored-by: Marina Gornostaeva <gornostaevamv@gmail.com>
…gleService-Info.plist not included correctly; Removed CODE_OF_CONDUCT.md from copied resources (#5)
@Sombre-Osmoze
Sombre-Osmoze merged commit c3989a9 into master Jun 1, 2020
hybridcattt added a commit that referenced this pull request Jul 16, 2020
* Update Code of Conduct Contact Info (#1)

* Update Code of Conduct Contact Info

* Update Code of Conduct to v2.0 and Contact

Noticed that I had initialized an older version of the Contributor Covenant. This updates to the newer language and adds @FranckNdame as our current enforcement contact.

* Development (#7)

* CocoaPods integration (#2)

* Feature/firestore (#3)

* CocoaPods integration

* Added Firestore and CodableFirebase pods; Added services and Naviagor;

* Added String+STN; Updated Log to use string extension;

* removed Pods/

* removed UIKit import

* removed UIKit import

Co-authored-by: Marina Gornostaeva <gornostaevamv@gmail.com>

* fixed random folders from repo to repo merge; fixed an issue with GoogleService-Info.plist not included correctly; Removed CODE_OF_CONDUCT.md from copied resources (#5)

Co-authored-by: Marina <gornostaevamv@gmail.com>
Co-authored-by: EvilPenguin <evilpenguin@users.noreply.github.com>

* update build number

Co-authored-by: Mary Hayes <mary@theknittingdeveloper.com>
Co-authored-by: Kyle Lee <kiloloco@me.com>
Co-authored-by: EvilPenguin <evilpenguin@users.noreply.github.com>
Co-authored-by: FranckNdame <franckmpouli@gmail.com>
hybridcattt added a commit that referenced this pull request Oct 7, 2020
* master:
  Try to always run build CI job
  Bumped version to 1.1 (6)
  update build number
  Development (#7)
  Update Code of Conduct Contact Info (#1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants