Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

Fix capitalization for short words #680

Merged
merged 2 commits into from
Oct 23, 2017
Merged

Conversation

BasThomas
Copy link
Collaborator

@rnystrom rnystrom merged commit c2c8e4e into master Oct 23, 2017
@rnystrom rnystrom deleted the fix-capitalization-short-words branch October 23, 2017 21:14
rizwankce added a commit to rizwankce/GitHawk that referenced this pull request Oct 24, 2017
* master:
  Removed cell dividers, added bg color (GitHawkApp#690)
  Fix capitalization for short words (GitHawkApp#680)
  Rename "Add to Bookmark" to simply "Bookmark" (GitHawkApp#681)
  Standardized sign-in/out copy (GitHawkApp#689)
  Preventing the search race condition instead of responding to it (GitHawkApp#691)
  [FIX] scroll to top for bookmarks screen (GitHawkApp#693)
  [ADD] 3D touch short cut item for bookmarks tab (GitHawkApp#699)
  Thin SwiftLint ruleset (GitHawkApp#704)
  Remove erroneous double localization
  Some general text improvements

# Conflicts:
#	Classes/Bookmark/BookmarksViewController.swift
rizwankce added a commit to rizwankce/GitHawk that referenced this pull request Oct 24, 2017
* master:
  Removed cell dividers, added bg color (GitHawkApp#690)
  Fix capitalization for short words (GitHawkApp#680)
  Rename "Add to Bookmark" to simply "Bookmark" (GitHawkApp#681)
  Standardized sign-in/out copy (GitHawkApp#689)
  Preventing the search race condition instead of responding to it (GitHawkApp#691)
  [FIX] scroll to top for bookmarks screen (GitHawkApp#693)
  [ADD] 3D touch short cut item for bookmarks tab (GitHawkApp#699)
  Thin SwiftLint ruleset (GitHawkApp#704)
  Remove erroneous double localization
  Some general text improvements

# Conflicts:
#	Classes/Bookmark/BookmarksViewController.swift
rizwankce added a commit to rizwankce/GitHawk that referenced this pull request Oct 24, 2017
* master:
  Removed cell dividers, added bg color (GitHawkApp#690)
  Fix capitalization for short words (GitHawkApp#680)
  Rename "Add to Bookmark" to simply "Bookmark" (GitHawkApp#681)
  Standardized sign-in/out copy (GitHawkApp#689)
  Preventing the search race condition instead of responding to it (GitHawkApp#691)
  [FIX] scroll to top for bookmarks screen (GitHawkApp#693)
  Remove erroneous double localization
  Some general text improvements

# Conflicts:
#	Classes/Utility/AlertAction.swift
#	Classes/Views/Constants.swift
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants